Changeset 4831


Ignore:
Timestamp:
Mar 24, 2009, 8:28:38 AM (13 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #1260: Incorrect title on import dialog when opened from array slide and array batch pages

And an identical problem for scans and experiments.

Location:
branches/2.10-stable/www
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.10-stable/www/lims/arraybatches/index.jsp

    r4587 r4831  
    264264    cc.configureQuery(query, true);
    265265    cc.setQuery(query);
    266     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+hybridizations";
     266    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+array+batches";
    267267  }
    268268  else if ("ExportItem".equals(cmd))
     
    270270    // Run an export plugin in single-item context
    271271    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    272     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+hybridization";
     272    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+array+batch";
    273273  }
    274274  else if ("ImportItems".equals(cmd))
     
    279279    cc.configureQuery(query, true);
    280280    cc.setQuery(query);
    281     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+hybrydizations";
     281    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+array+batches";
    282282  }
    283283  else if ("ImportItem".equals(cmd))
     
    285285    // Run an import plugin in single-item context
    286286    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    287     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+hybridization";
     287    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+array+batch";
    288288  }
    289289  else if ("RunListPlugin".equals(cmd))
  • branches/2.10-stable/www/lims/arrayslides/index.jsp

    r4587 r4831  
    312312    cc.configureQuery(query, true);
    313313    cc.setQuery(query);
    314     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+hybridizations";
     314    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+array+slides";
    315315  }
    316316  else if ("ExportItem".equals(cmd))
     
    318318    // Run an export plugin in single-item context
    319319    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    320     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+hybridization";
     320    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+array+slide";
    321321  }
    322322  else if ("ImportItems".equals(cmd))
     
    327327    cc.configureQuery(query, true);
    328328    cc.setQuery(query);
    329     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+hybrydizations";
     329    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+array+slides";
    330330  }
    331331  else if ("ImportItem".equals(cmd))
     
    333333    // Run an import plugin in single-item context
    334334    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    335     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+hybridization";
     335    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+array+slide";
    336336  }
    337337  else if ("RunListPlugin".equals(cmd))
  • branches/2.10-stable/www/views/experiments/index.jsp

    r4630 r4831  
    303303    cc.configureQuery(query, true);
    304304    cc.setQuery(query);
    305     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+raw+bioassays";
     305    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+experiments";
    306306  }
    307307  else if ("ExportItem".equals(cmd))
     
    309309    // Run an export plugin in single-item context
    310310    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    311     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+raw+bioassay";
     311    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+experiment";
    312312  }
    313313  else if ("ImportItems".equals(cmd))
     
    318318    cc.configureQuery(query, true);
    319319    cc.setQuery(query);
    320     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+raw+bioassays";
     320    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+experiments";
    321321  }
    322322  else if ("ImportItem".equals(cmd))
     
    324324    // Run an import plugin in single-item context
    325325    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    326     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+raw+bioassay";
     326    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+experiment";
    327327  }
    328328  else if ("RunListPlugin".equals(cmd))
  • branches/2.10-stable/www/views/scans/index.jsp

    r4587 r4831  
    268268    cc.configureQuery(query, true);
    269269    cc.setQuery(query);
    270     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+raw+bioassays";
     270    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+scans";
    271271  }
    272272  else if ("ExportItem".equals(cmd))
     
    274274    // Run an export plugin in single-item context
    275275    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    276     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+raw+bioassay";
     276    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+scan";
    277277  }
    278278  else if ("ImportItems".equals(cmd))
     
    283283    cc.configureQuery(query, true);
    284284    cc.setQuery(query);
    285     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+raw+bioassays";
     285    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+scans";
    286286  }
    287287  else if ("ImportItem".equals(cmd))
     
    289289    // Run an import plugin in single-item context
    290290    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    291     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+raw+bioassay";
     291    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+scan";
    292292  }
    293293  else if ("RunListPlugin".equals(cmd))
Note: See TracChangeset for help on using the changeset viewer.