Changeset 7747
- Timestamp:
- Sep 16, 2019, 8:58:33 AM (3 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/3.15-stable merged: 7737,7739-7744 /tags/3.15.2 (added) merged: 7745
- Property svn:mergeinfo changed
-
trunk/src/plugins/core/core-plugins.xml
r7642 r7747 546 546 </settings> 547 547 </plugin-definition> 548 549 <plugin-definition id="TagImporter"> 550 <about> 551 <name>Tag importer</name> 552 <description> 553 Imports and updates tag items in a batch. 554 </description> 555 </about> 556 <plugin-class>net.sf.basedb.plugins.batchimport.TagImporter</plugin-class> 557 </plugin-definition> 548 558 549 559 <plugin-definition id="BioSourceImporter"> -
trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java
r7703 r7747 628 628 this.failIfNotFoundItems = !createMode && "fail".equals(getErrorOption("itemNotFoundError")); 629 629 this.updateExistingItems = updateMode; 630 this.failIfItemExists = createMode && "fail".equals(getErrorOption("itemExistsError"));630 this.failIfItemExists = createMode && !updateMode && "fail".equals(getErrorOption("itemExistsError")); 631 631 this.failIfMultipleFoundItems = "fail".equals(getErrorOption("multipleItemsFoundError")); 632 632 this.failIfNotFoundReference = "fail".equals(getErrorOption("referenceNotFoundError")); … … 2713 2713 parameters.add(defaultErrorParameter); 2714 2714 if (!createMode) parameters.add(itemNotFoundErrorParameter); 2715 if (createMode ) parameters.add(itemExistsErrorParameter);2715 if (createMode && !updateMode) parameters.add(itemExistsErrorParameter); 2716 2716 parameters.add(multipleItemsFoundErrorParameter); 2717 2717 if (updateMode) parameters.add(noWritePermissionToItemErrorParameter); -
trunk/www/views/itemlists/edit_list.jsp
r7604 r7747 66 66 Item memberType = addItems ? Item.valueOf(request.getParameter("memberType")) : null; 67 67 String formId = addItems ? Values.getStringOrNull(request.getParameter("formId")) : null; 68 String subContext = addItems ? Values.getStringOrNull(request.getParameter("subContext")) : null; 69 68 String subContext = Values.getString(request.getParameter("subContext"), ""); 69 70 ItemContext filterContext = addItems && memberType != null ? sc.getCurrentContext(memberType, subContext) : null; 71 boolean hasSourceFilter = filterContext != null && filterContext.getNumPropertyFilters() > 0; 72 70 73 ItemQuery<ItemSubtype> subtypesQuery = null; 71 74 boolean readCurrentSubtype = true; … … 252 255 <input type="radio" name="source" id="sourceAll" value="all" checked 253 256 ><label for="sourceAll">All pages</label><br> 254 <input type="checkbox" name="syncFilter" id="syncFilter" value="1" checked style="margin-left:2em;" 255 ><label for="syncFilter">Remember current filter for future re-sync</label> 257 <% 258 if (hasSourceFilter) 259 { 260 %> 261 <input type="checkbox" name="syncFilter" id="syncFilter" value="1" checked style="margin-left:2em;" 262 ><label for="syncFilter">Remember current filter for future re-sync</label> 263 <% 264 } 265 %> 256 266 </td> 257 267 <td></td> -
trunk/www/views/itemlists/index.jsp
r7605 r7747 283 283 if ("all".equals(source)) 284 284 { 285 useSyncFilter = Values.getBoolean(request.getParameter("syncFilter")) ;285 useSyncFilter = Values.getBoolean(request.getParameter("syncFilter")) && filterContext.getNumPropertyFilters() > 0; 286 286 query.setFirstResult(0); 287 287 query.setMaxResults(-1); -
trunk/www/views/itemlists/lists.js
r7604 r7747 265 265 { 266 266 var frm = document.forms['list']; 267 frm.syncFilter.disabled = !Doc.element('sourceAll').checked;267 if (frm.syncFilter) frm.syncFilter.disabled = !Doc.element('sourceAll').checked; 268 268 } 269 269 -
trunk/www/views/itemlists/view_list.jsp
r7604 r7747 350 350 item="SYNCFILTER" 351 351 action="syncfilter/index.jsp" 352 dragcolumns="false" 352 353 > 353 354 <tbl:hidden name="list_id" value="<%=Integer.toString(itemId) %>" /> -
trunk/www/views/jobs/view_job.jsp
r7326 r7747 726 726 tooltip="Run this dry-run job for real" 727 727 /> 728 <base:button 729 id="btnReconfigureJob" 730 title="Re-configure job" 731 image="runplugin.png" 732 tooltip="Change the parameters for this job and try again" 733 visible="<%=job.hasContext()%>" 734 /> 728 735 <% 729 736 }
Note: See TracChangeset
for help on using the changeset viewer.