Changeset 7747

Timestamp:

Sep 16, 2019, 8:58:33 AM (2 years ago)

Author:

Nicklas Nordborg

Message:

Merge patch release BASE 3.15.2 to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/core/core-plugins.xml (modified) (1 diff)
• src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java (modified) (2 diffs)
• src/plugins/core/net/sf/basedb/plugins/batchimport/TagImporter.java (copied) (copied from tags/3.15.2/src/plugins/core/net/sf/basedb/plugins/batchimport/TagImporter.java)
• www/views/itemlists/edit_list.jsp (modified) (2 diffs)
• www/views/itemlists/index.jsp (modified) (1 diff)
• www/views/itemlists/lists.js (modified) (1 diff)
• www/views/itemlists/view_list.jsp (modified) (1 diff)
• www/views/jobs/view_job.jsp (modified) (1 diff)

trunk/src/plugins/core/core-plugins.xml

@@ -546 +546 @@
     </settings>
   </plugin-definition>
+  
+  <plugin-definition id="TagImporter">
+    <about>
+      <name>Tag importer</name>
+      <description>
+        Imports and updates tag items in a batch.
+      </description>
+    </about>
+    <plugin-class>net.sf.basedb.plugins.batchimport.TagImporter</plugin-class>
+  </plugin-definition>
 
   <plugin-definition id="BioSourceImporter">

trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java

@@ -628 +628 @@
     this.failIfNotFoundItems = !createMode && "fail".equals(getErrorOption("itemNotFoundError"));
     this.updateExistingItems = updateMode;
-    this.failIfItemExists = createMode && "fail".equals(getErrorOption("itemExistsError"));
+    this.failIfItemExists = createMode && !updateMode && "fail".equals(getErrorOption("itemExistsError"));
     this.failIfMultipleFoundItems = "fail".equals(getErrorOption("multipleItemsFoundError"));
     this.failIfNotFoundReference = "fail".equals(getErrorOption("referenceNotFoundError"));
@@ -2713 +2713 @@
       parameters.add(defaultErrorParameter);
       if (!createMode) parameters.add(itemNotFoundErrorParameter);
-      if (createMode) parameters.add(itemExistsErrorParameter);
+      if (createMode && !updateMode) parameters.add(itemExistsErrorParameter);
       parameters.add(multipleItemsFoundErrorParameter);
       if (updateMode) parameters.add(noWritePermissionToItemErrorParameter);

trunk/www/views/itemlists/edit_list.jsp

@@ -66 +66 @@
   Item memberType = addItems ? Item.valueOf(request.getParameter("memberType")) : null;
   String formId = addItems ? Values.getStringOrNull(request.getParameter("formId")) : null;
-  String subContext = addItems ? Values.getStringOrNull(request.getParameter("subContext")) : null;
-
+  String subContext = Values.getString(request.getParameter("subContext"), "");
+  
+  ItemContext filterContext = addItems && memberType != null ? sc.getCurrentContext(memberType, subContext) : null;
+  boolean hasSourceFilter = filterContext != null && filterContext.getNumPropertyFilters() > 0;
+  
   ItemQuery<ItemSubtype> subtypesQuery = null;
   boolean readCurrentSubtype = true;
@@ -252 +255 @@
             <input type="radio" name="source" id="sourceAll" value="all" checked
               ><label for="sourceAll">All pages</label><br>
-              <input type="checkbox" name="syncFilter" id="syncFilter" value="1" checked style="margin-left:2em;"
-                ><label for="syncFilter">Remember current filter for future re-sync</label>
+              <%
+              if (hasSourceFilter) 
+              {
+                %>
+                <input type="checkbox" name="syncFilter" id="syncFilter" value="1" checked style="margin-left:2em;"
+                  ><label for="syncFilter">Remember current filter for future re-sync</label>
+                <%
+              }
+              %>
           </td>
           <td></td>

trunk/www/views/itemlists/index.jsp

@@ -283 +283 @@
           if ("all".equals(source))
           {
-            useSyncFilter = Values.getBoolean(request.getParameter("syncFilter"));
+            useSyncFilter = Values.getBoolean(request.getParameter("syncFilter")) && filterContext.getNumPropertyFilters() > 0;
             query.setFirstResult(0);
             query.setMaxResults(-1);

trunk/www/views/itemlists/lists.js

@@ -265 +265 @@
   {
     var frm = document.forms['list'];
-    frm.syncFilter.disabled = !Doc.element('sourceAll').checked;
+    if (frm.syncFilter) frm.syncFilter.disabled = !Doc.element('sourceAll').checked;
   }
   

trunk/www/views/itemlists/view_list.jsp

@@ -350 +350 @@
           item="SYNCFILTER"
           action="syncfilter/index.jsp"
+          dragcolumns="false"
           >
           <tbl:hidden name="list_id" value="<%=Integer.toString(itemId) %>" />

trunk/www/views/jobs/view_job.jsp

@@ -726 +726 @@
           tooltip="Run this dry-run job for real"
         />
+        <base:button 
+          id="btnReconfigureJob"
+          title="Re-configure job"
+          image="runplugin.png"
+          tooltip="Change the parameters for this job and try again"
+          visible="<%=job.hasContext()%>"
+        />
         <%
       }