Merge lp:~christopher-bradshaw-b/tiqit/dev into lp:tiqit

[Christopher Bradshaw]

Adding disable double-click-to-edit preference.
Grouping by field.name instead of field.shortname when adding a column. This fixes the bug where fields like "Activity-when-found" couldn't be grouped.
Errors truncated to 3000 characters to stop internal server error when very long summaries are submitted.

Adding disable double-click-to-edit preference.
Grouping by field.name instead of field.shortname when adding a column. This fixes the bug where fields like "Activity-when-found" couldn't be grouped.
Errors truncated to 3000 characters to stop internal server error when very long summaries are submitted.

[Ensoft Patch Lander (ensoft-lander)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

[lp:~christopher-bradshaw-b/tiqit/dev]

10. By Christopher Bradshaw <email address hidden> on 2016-01-18

Reverting changes to clear button on bug view page

[Sam Stoll (samstoll1)]

review: Approve

=== modified file 'scripts/pages/prefs.py'
--- scripts/pages/prefs.py	2015-12-14 16:49:02 +0000
+++ scripts/pages/prefs.py	2016-01-18 16:01:00 +0000
@@ -261,6 +261,8 @@
                       "Suppress automatically refresh of search results every 30 minutes."),
 print prefs.printBool("miscHidePerRowAutoUpdateClear",
                       "Don't allow marked changes to be cleared individually for each bug."),
+print prefs.printBool("miscDisableDblclkEdit",
+                      "Disable double-click-to-edit."),
 print '\n'.join(plugins.printSearchPrefs(prefs))
 
 print """</table>

=== modified file 'scripts/tiqit/__init__.py' (properties changed: +x to -x)
--- scripts/tiqit/__init__.py	2016-01-18 15:12:24 +0000
+++ scripts/tiqit/__init__.py	2016-01-18 16:01:00 +0000
@@ -640,6 +640,7 @@
         'miscNeverAutoRefreshResults': 'false',
         'miscHidePerRowAutoUpdateClear': 'false',
         'miscHideWatermark': 'false',
+        'miscDisableDblclkEdit': 'false',
         'miscToolbar': 'both',
         'miscMaxAutoloadSize': '10485760',
         'miscAlwaysFullView': 'false',
@@ -1310,8 +1311,15 @@
         Exception.__init__(self)
         self.type = type
         self.msg = msg
-        self.output = output
-        self.cmd = cmd
+        if len(output) > 3000:
+            self.output = output[:3000] + \
+                "...(truncated)', which is longer than allowed length"
+        else:
+            self.output = output
+        if len(cmd) > 3000:
+            self.cmd = cmd[:3000] + "...(truncated)'" 
+        else:
+            self.cmd = cmd
 
 class TiqitError(TiqitException):
     def __init__(self, msg='', output='', cmd=''):

=== modified file 'static/scripts/filter.js'
--- static/scripts/filter.js	2014-06-05 14:38:53 +0000
+++ static/scripts/filter.js	2016-01-18 16:01:00 +0000
@@ -128,10 +128,10 @@
     // If there's a grouper, then we need to add an entry there too
     if (filters.grouper) {
         var opt = document.createElement('option');
-        opt.value = field.shortname;
+        opt.value = field.name;
         opt.appendChild(document.createTextNode(opt.value));
 
-        filters.grouper[field.shortname] = opt;
+        filters.grouper[field.name] = opt;
         filters.grouper.appendChild(opt);
         selectSort(filters.grouper);
     }

=== modified file 'static/scripts/multiedit.js'
--- static/scripts/multiedit.js	2014-06-05 14:38:53 +0000
+++ static/scripts/multiedit.js	2016-01-18 16:01:00 +0000
@@ -42,25 +42,28 @@
       }
     }
 
-    // Add a double click event handler
-    tables[i].addEventListener('dblclick', function(event) {
-      var cell = getAncestorOfType(event.target, 'TD');
-      if (cell) {
-        var row = getAncestorOfType(cell, 'TR');
-        if (!row.tiqitSaving) {
-          var table = getAncestorOfType(row, 'TABLE');
-          var colIndex = cell.cellIndex;
-          var field = table.tHead.rows[0].cells[colIndex].getAttribute('field');
-          if (contains(allEditableFields, field)) {
-            if (cell.tiqitEditing) {
-              stopEditingCell(row, cell, field);
-            } else {
-              startEditingCell(row, cell, field);
+    // Add a double click event handler unless disabled in preferences
+    if (Tiqit.prefs['miscDisableDblclkEdit'] == undefined ||
+        Tiqit.prefs['miscDisableDblclkEdit'] == 'false') {
+      tables[i].addEventListener('dblclick', function(event) {
+        var cell = getAncestorOfType(event.target, 'TD');
+        if (cell) {
+          var row = getAncestorOfType(cell, 'TR');
+          if (!row.tiqitSaving) {
+            var table = getAncestorOfType(row, 'TABLE');
+            var colIndex = cell.cellIndex;
+            var field = table.tHead.rows[0].cells[colIndex].getAttribute('field');
+            if (contains(allEditableFields, field)) {
+              if (cell.tiqitEditing) {
+                stopEditingCell(row, cell, field);
+              } else {
+                startEditingCell(row, cell, field);
+              }
             }
           }
         }
-      }
-    }, false);
+      }, false);
+    }
   }
 }