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

[Christopher Bradshaw]

Adding structure for plugins to add their own attribute fields
Adding custom event generator for "AttributesChanged"

Unmerged revisions

6. By Christopher Bradshaw <email address hidden> on 2015-12-01

Adding structure for plugins to specify which additional attribute fields.
Adding custom event listener "AttributesChanged", when one of the attributes fields is changed.

=== modified file 'scripts/pages/results.py'
--- scripts/pages/results.py	2014-11-10 14:11:37 +0000
+++ scripts/pages/results.py	2015-12-01 12:30:39 +0000
@@ -68,19 +68,22 @@
 # Build up the list of fields we need for correct operation
 # These are parent fields and bannedIf fields of all the selected fields
 #
-parents = set()
+attr_fields = set()
 for field in selection:
     for parent in field._parentFields:
-        parents.add(allFields[parent])
+        attr_fields.add(allFields[parent])
 
     for bannedIf in field._bannedIf.keys():
-        parents.add(allFields[bannedIf])
+        attr_fields.add(allFields[bannedIf])
 
     for defWith in field.defaultsWith:
-        parents.add(allFields[defWith])
+        attr_fields.add(allFields[defWith])
+
+    for pluginField in plugins.getAttributeFields():
+        attr_fields.add(allFields[pluginField])
 
 # We actually request the selected ones, and their dependees
-requested = selection + list(parents)
+requested = selection + list(attr_fields)
 
 states, proj, buglist, usertype, username = parseAdvanced(args)
 
@@ -97,6 +100,7 @@
     function init() {
       tiqitFilterInit("results");
       tiqitTableInit("results", true, true);
+      generateCustomEvent('ResultsLoad', document.getElementsByTagName('table'));
     }
     tiqitSearchName = "%s";
     tiqitSearchQuery = %s;
@@ -217,7 +221,7 @@
         printTableHeader(prikey, tableNameCounter)
 
         # We'll be adding attributes to each row, so get the names once
-        attr_names = [x.name for x in parents]
+        attr_names = [x.name for x in attr_fields]
 
         for bug in matches:
             # Check whether we need to start a new table
@@ -232,11 +236,11 @@
             # Construct the parent list. All parents should be there as
             # attributes whether their values are empty or not
             # 
-            attr_values = ["'%s'" % encodeHTML(bug[x.name]) for x in parents]
+            attr_values = ["'%s'" % encodeHTML(bug[x.name]) for x in attr_fields]
             attributes = map("=".join, zip(attr_names, attr_values))
 
             pretty_vals = [bug.getSanitisedValue(x.name, outputType == FORMAT_NORMAL) for x in selection]
-
+            
             print "<tr id='%s' lastupdate='%s'%s><td>%s</td></tr>" % (bug['Identifier'], bug['Sys-Last-Updated'], " ".join(attributes), "</td><td>".join(pretty_vals))
 
         printTableFooter()
 
=== modified file 'static/scripts/multiedit.js'
--- static/scripts/multiedit.js	2014-06-05 14:38:53 +0000
+++ static/scripts/multiedit.js	2015-12-01 12:30:39 +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);
+    }
   }
 }
 
@@ -213,12 +216,17 @@
   if (event.target.status == 200 && event.target.responseXML) {
     var bugs = event.target.responseXML.getElementsByTagName('bug');
     for (var i = 0; i < bugs.length; i++) {
+      var attributesChanged = false;
       var row = document.getElementById(bugs[i].getAttribute('identifier'));
       var table = getAncestorOfType(row, 'TABLE');
       var fields = event.target.responseXML.getElementsByTagName('field');
       cancelRowSave(row);
       row.setAttribute('lastupdate', bugs[i].getAttribute('lastupdate'));
       for (var j = 0; j < fields.length; j++) {
+        if (row.hasAttribute(fields[j].getAttribute('name'))) {
+          row.setAttribute(fields[j].getAttribute('name'), fields[j].textContent.trim());
+          attributesChanged = true;
+        }
         for (var k = 0; k < table.tHead.rows[0].cells.length; k++) {
           var head = table.tHead.rows[0].cells[k];
           var field = head.getAttribute('field');
@@ -245,6 +253,9 @@
           }
         }
       }
+      if (attributesChanged) {
+        generateCustomEvent("AttributesChanged", row);
+      }
     }
   } else if (event.target.responseXML) {
     var msgs = event.target.responseXML.getElementsByTagName('message');
 
=== modified file 'static/scripts/updateresults.js'
--- static/scripts/updateresults.js	2014-06-05 14:38:53 +0000
+++ static/scripts/updateresults.js	2015-12-01 12:30:39 +0000
@@ -289,12 +289,14 @@
     var fields = bugs[i].getElementsByTagName('field');
 
     if (oldLine) {
+      var attributesChanged = false;
       for (var j = 0; j < fields.length; j++) {
         var field = fields[j].getAttribute('name');
         var colIndex = colForField(field);
         // If there is an attribute for this field, then update it.
         if (oldLine.hasAttribute(field)) {
-            oldLine.setAttribute(field, fields[j].textContent.trim());
+          attributesChanged = true;
+          oldLine.setAttribute(field, fields[j].textContent.trim());
         }
         
         // Now check whether this field is displayed
@@ -421,6 +423,9 @@
         oldLine.style.outline = 'solid red 2px';
         oldLine.style.backgroundColor = 'rgb(255, 240, 220)';
       }
+      if (attributesChanged) {
+        generateCustomEvent("AttributesChanged", oldLine);
+      }
     } else {
       // This is a brand new bug. Add a new line for it.
       // We'll re-filter and group at the end, so just stick it in first