Merge pull request #519 from Martii/Issue-261DataList

Issue 261 data list Auto-merge ... no additional comments
OpenUserJS · Jan 12, 2015 · 7610bcb · 7610bcb
2 parents 17b69b2 + 4f86b35
commit 7610bcb
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 3 deletions.
diff --git a/controllers/remove.js b/controllers/remove.js
@@ -74,7 +74,7 @@ exports.rm = function (aReq, aRes, aNext) {
                 return aNext();
               }
 
-              // Destory all the sessions belonging to the removed user
+              // Destroy all the sessions belonging to the removed user
               destroySessions(aReq, aUser, function () {
                 aRes.redirect('/');
               });

diff --git a/controllers/script.js b/controllers/script.js
@@ -24,6 +24,7 @@ var modelQuery = require('../libs/modelQuery');
 var modelParser = require('../libs/modelParser');
 var countTask = require('../libs/tasks').countTask;
 var pageMetadata = require('../libs/templateHelpers').pageMetadata;
+var removeReasons = require('../views/includes/scriptModals.json').removeReasons;
 
 // Let controllers know this is a `new` route
 exports.new = function (aController) {
@@ -275,6 +276,14 @@ var setupScriptSidePanel = function (aOptions) {
   if (authedUser && authedUser.isMod) {
     //aOptions.authorTools = {}; // TODO: Support moderator edits on scripts?
     aOptions.modTools = {};
+
+    if (removeReasons) {
+      aOptions.modTools.hasRemoveReasons = true;
+      aOptions.modTools.removeReasons = [];
+      removeReasons.forEach(function (aReason) {
+        aOptions.modTools.removeReasons.push({ 'name' : aReason });
+      });
+    }
   }
 
   // Admin

diff --git a/controllers/user.js b/controllers/user.js
@@ -40,6 +40,7 @@ var settings = require('../models/settings.json');
 var github = require('./../libs/githubClient');
 var pageMetadata = require('../libs/templateHelpers').pageMetadata;
 var orderDir = require('../libs/templateHelpers').orderDir;
+var removeReasons = require('../views/includes/userModals.json').removeReasons;
 
 function caseInsensitive (aStr) {
   return new RegExp('^' + (aStr || '').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1")
@@ -127,6 +128,14 @@ var setupUserSidePanel = function (aOptions) {
   if (authedUser && authedUser.isMod && (authedUser.role < user.role || aOptions.isYou)) {
     //aOptions.userTools = {}; // TODO: Support moderator edits of user profiles?
     aOptions.modTools = {};
+
+    if (removeReasons) {
+      aOptions.modTools.hasRemoveReasons = true;
+      aOptions.modTools.removeReasons = [];
+      removeReasons.forEach(function (aReason) {
+        aOptions.modTools.removeReasons.push({ 'name' : aReason });
+      });
+    }
   }
 
   // Admin

diff --git a/views/includes/scriptModals.html b/views/includes/scriptModals.html
@@ -33,7 +33,12 @@ <h4 class="modal-title">Remove {{script.fullName}}</h4>
       </div>
       <div class="modal-footer">
         <form action="{{{script.scriptRemovePageUrl}}}" method="post" enctype="multipart/form-data">
-          <input type="text" class="form-control" name="reason" placeholder="Reason for removal.">
+          <input type="text" class="form-control" name="reason" placeholder="Reason for removal."{{#modTools.removeReasons}} list="reasons"{{/modTools.removeReasons}}>
+          {{#modTools.hasRemoveReasons}}
+          <datalist id="reasons">
+            {{#modTools.removeReasons}}<option value="{{{name}}}"></option>{{/modTools.removeReasons}}
+          </datalist>
+          {{/modTools.hasRemoveReasons}}
           <br />
           <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-fw fa-close"></i> Close</button>
           <input type="hidden" name="remove" value="true">

diff --git a/views/includes/scriptModals.json b/views/includes/scriptModals.json
@@ -0,0 +1,18 @@
+{
+  "removeReasons" : [
+    "Bad external script host ",
+    "Cookie stealing ",
+    "Incomplete metadata block ",
+    "Licensing conflict ",
+    "Malware ",
+    "Obfuscated script ",
+    "Obfuscated external script ",
+    "Privacy stealing ",
+    "Spamming ",
+    "Unattributed script derivative ",
+    "Undocumented auto-like ",
+    "Vague description ",
+    "Vague script ",
+    "XSS attack "
+  ]
+}
diff --git a/views/includes/userModals.html b/views/includes/userModals.html
@@ -11,7 +11,12 @@ <h4 class="modal-title">Remove {{user.name}}</h4>
       </div>
       <div class="modal-footer">
         <form action="{{{user.userRemovePageUrl}}}" method="post" enctype="multipart/form-data">
-          <input type="text" class="form-control" name="reason" placeholder="Reason for removal.">
+          <input type="text" class="form-control" name="reason" placeholder="Reason for removal."{{#modTools.removeReasons}} list="reasons"{{/modTools.removeReasons}}>
+          {{#modTools.hasRemoveReasons}}
+          <datalist id="reasons">
+            {{#modTools.removeReasons}}<option value="{{{name}}}"></option>{{/modTools.removeReasons}}
+          </datalist>
+          {{/modTools.hasRemoveReasons}}
           <br />
           <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-fw fa-close"></i> Close</button>
           <input type="hidden" name="remove" value="true">

diff --git a/views/includes/userModals.json b/views/includes/userModals.json
@@ -0,0 +1,18 @@
+{
+  "removeReasons" : [
+    "Bad external script hosts ",
+    "Cookie stealings ",
+    "Incomplete metadata blocks ",
+    "Licensing conflicts ",
+    "Malwares ",
+    "Obfuscated scripts ",
+    "Obfuscated external scripts ",
+    "Privacy stealings ",
+    "Spammings ",
+    "Unattributed script derivatives ",
+    "Undocumented auto-likes ",
+    "Vague descriptions ",
+    "Vague scripts ",
+    "XSS attacks "
+  ]
+}