Changeset 6729

Timestamp:

Feb 13, 2015, 9:44:56 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1910 and #1908.

Batch inherit annotations has been updated to not allow selection of annotation type that has been disabled for inheritance.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/AnnotationUtil.java (modified) (1 diff)
• www/common/annotations/batch_inherit.js (modified) (6 diffs)
• www/common/annotations/index.jsp (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/AnnotationUtil.java

@@ -63 +63 @@
     json.put("id", at.getId());
     json.put("name", at.getName());
-    
+    if (at.getDisableInheritance())
+    {
+      json.put("disableInheritance", 1);
+      return json;
+    }
     // Load categories for the annotation type
     ItemQuery<AnnotationTypeCategory> categoryQuery = AnnotationTypeCategory.getQuery();

trunk/www/common/annotations/batch_inherit.js

@@ -29 +29 @@
   
   var selectedAnnotationTypes = [];
+  var allowedAnnotationTypes = [];
 
   inherit.initPage = function()
@@ -56 +57 @@
   inherit.selectAnnotationTypes = function(event)
   {
-    var url = '&exclude='+selectedAnnotationTypes.join(',');
+    var url = '&resetTemporary=1&tmpfilter:BOOLEAN:disableInheritance=false';
+    url += '&exclude='+selectedAnnotationTypes.join(',');
     Dialogs.selectItem('ANNOTATIONTYPE', event.currentTarget.id, 1, url);
   }
@@ -125 +127 @@
   inherit.addMoreAnnotationTypeInfo = function(item)
   {
+    if (item.disableInheritance)
+    {
+      var frm = document.forms['annotations'];
+      var action = frm['action_'+item.id];
+      action.length = 0;
+      action[0] = new Option('Inheritance disabled');
+      action.disabled = true;
+      frm['from_'+item.id].disabled = true;
+      frm['nodup_'+item.id].disabled = true;
+      frm['replace_'+item.id].disabled = true;
+      return;
+    }
     
+    allowedAnnotationTypes[allowedAnnotationTypes.length] = item.id;
     var selection = Doc.element('from_'+item.id);
     for (var i = 0; i < item.subtypes.length; i++)
@@ -142 +157 @@
       if (selection.selectedIndex == 0) selection.selectedIndex = 1;
     }
-    
   }
   
@@ -161 +175 @@
   inherit.save = function()
   {
-    if (selectedAnnotationTypes.length == 0)
+    if (allowedAnnotationTypes.length == 0)
     {
       Forms.showNotification('btnSelectAnnotationTypes', 'Please select annotation types to inherit!');
@@ -168 +182 @@
     var frm = document.forms['annotations'];
     frm.cmd.value = 'BatchInherit';
-    Forms.addHidden(frm, 'annotationTypes', selectedAnnotationTypes.join(','));
+    Forms.addHidden(frm, 'annotationTypes', allowedAnnotationTypes.join(','));
     frm.submit();
   }

trunk/www/common/annotations/index.jsp

@@ -111 +111 @@
     {
       AnnotationType at = AnnotationType.getById(newDc, atId);
+      if (at.getDisableInheritance()) continue; // Inheritance has been disabled
+      
       InheritSpecification spec = new InheritSpecification(at);
       String action = request.getParameter("action_"+atId);
@@ -131 +133 @@
       }
       manager.addSpecification(spec);
-      
-      //System.out.println("at:" + atId + "; " + action + "; from=" + from + "; noDup="+noDup + "; replace="+replaceExisting);
     }
     newDc.commit();