Changeset 6730

Timestamp:

Feb 13, 2015, 10:25:31 AM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #1910: Disable annotation inheritance for annotation types

Experiment view page checks if inheritance is disabled before trying to inherit annotations for an experimental factor.

Location:

trunk/www/views/experiments

Files:

• experiments.js (modified) (2 diffs)
• view_experiment.jsp (modified) (1 diff)

trunk/www/views/experiments/experiments.js

@@ -171 +171 @@
           ' raw bioassays have a value for this experimental factor">';
       }
+      else if (fv.disableInheritance)
+      {
+        status = '<img src="../../images/notify.png" alt="!">&nbsp;Inheritance not allowed';
+      }
       else
       {
         numIncomplete++;
         var numMissing = numRawBioAssays - fv.numRawBioAssaysWithFactor;
-        status = '<table><tr>';
-        status += '<td><img src="../../images/warning.png" alt="!"';
-        status += ' title="' + numMissing + ' raw bioassays are missing a value for this experimental factor"></td>';
-        status += '<td style="text-align: center;">';
+        status = '<img src="../../images/warning.png" alt="!"';
+        status += ' title="' + numMissing + ' raw bioassays are missing a value for this experimental factor">';
         status += '<input type="checkbox" name="autoinherit" id="autoinherit'+fv.id+'" value="'+fv.id+'" checked';
         status += ' title="Select to automatically inherit annotations from parents"></td>';
-        status += '<td>&nbsp;<label for="autoinherit'+fv.id+'">' + numMissing + ' missing</label></td>'
-        status += '</tr></table>';
+        status += '<label for="autoinherit'+fv.id+'">' + numMissing + ' missing</label>';
       }
       statusDiv.innerHTML = status;
-
     }
     
     if (numIncomplete > 0)
     {
-      var checkAll = '<table><tr>';
-      checkAll += '<td></td>';
-      checkAll += '<td style="text-align: center;">';
+      var checkAll = '';
       checkAll += '<span id="check.uncheck" data-table-id="tbl.experimentalFactors" data-regexp="autoinherit" class="link" title="Check/uncheck all">';
-      checkAll += '<img src="../../images/check_uncheck.png" alt="x"></span></td>';
-      checkAll += '<td><img src="../../images/bullet.png" alt="*"></td>';
-      checkAll += '<td><span id="autoInherit" class="link"';
+      checkAll += '<img src="../../images/check_uncheck.png" alt="x"></span>';
+      checkAll += '&nbsp;<span id="autoInherit" class="link"';
       checkAll += ' title="Automatically try to inherit values for the selected experimental factors from parent items">';
-      checkAll += 'Auto-inherit</span></td>'
-      checkAll += '</tr></table>';
+      checkAll += 'Auto-inherit&hellip;</span>'
       Doc.element('tbl.experimentalFactors.status').innerHTML = checkAll;
       Doc.show('warning.missing');
@@ -205 +201 @@
       Events.addEventHandler('check.uncheck', 'click', Table.checkUncheckOnClick);
       Events.addEventHandler('autoInherit', 'click', experiments.autoInheritFactors);
-      
     }
   }

trunk/www/views/experiments/view_experiment.jsp

@@ -631 +631 @@
           JSONObject jsonAt = new JSONObject();
           jsonAt.put("id", at.getId());
+          jsonAt.put("disableInheritance", at.getDisableInheritance() ? 1 : 0);
           jsonAt.put("numRawBioAssaysWithFactor", factorValuesCount.get(at));