Changeset 7200


Ignore:
Timestamp:
Oct 17, 2016, 11:10:13 AM (6 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #2030: Import and export buttons in hardware and software list display "Import/export raw bioassays"

Location:
trunk/www/admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/admin/hardware/index.jsp

    r6328 r7200  
    296296    listInvoker.render(new ListColumnExportRenderer(cc));
    297297    dc.close();
    298     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+raw+bioassays";
     298    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+hardware";
    299299  }
    300300  else if ("ExportItem".equals(cmd))
     
    302302    // Run an export plugin in single-item context
    303303    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    304     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+raw+bioassay";
     304    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+hardware";
    305305  }
    306306  else if ("ImportItems".equals(cmd))
     
    313313    dc.close();
    314314    cc.setQuery(query);
    315     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+raw+bioassays";
     315    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+hardware";
    316316  }
    317317  else if ("ImportItem".equals(cmd))
     
    319319    // Run an import plugin in single-item context
    320320    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    321     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+raw+bioassay";
     321    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+hardware";
    322322  }
    323323  else if ("RunListPlugin".equals(cmd))
  • trunk/www/admin/software/index.jsp

    r6334 r7200  
    296296    listInvoker.render(new ListColumnExportRenderer(cc));
    297297    dc.close();
    298     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+raw+bioassays";
     298    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+software";
    299299  }
    300300  else if ("ExportItem".equals(cmd))
     
    302302    // Run an export plugin in single-item context
    303303    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    304     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+raw+bioassay";
     304    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+software";
    305305  }
    306306  else if ("ImportItems".equals(cmd))
     
    313313    dc.close();
    314314    cc.setQuery(query);
    315     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+raw+bioassays";
     315    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+software";
    316316  }
    317317  else if ("ImportItem".equals(cmd))
     
    319319    // Run an import plugin in single-item context
    320320    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    321     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+raw+bioassay";
     321    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+software";
    322322  }
    323323  else if ("RunListPlugin".equals(cmd))
Note: See TracChangeset for help on using the changeset viewer.