Changeset 2811


Ignore:
Timestamp:
Oct 26, 2006, 12:05:23 PM (17 years ago)
Author:
Nicklas Nordborg
Message:

Clear hidden 'exclude' filter that was set by popups

Location:
trunk
Files:
60 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

    r2776 r2811  
    180180
    181181  /**
    182     Same as: <code>getAndSetCurrentContext(sc, itemType, "", pageContext, defaultContext)</code>.
    183     @see #getAndSetCurrentContext(SessionControl, Item, String, PageContext, ItemContext)
     182    Same as: <code>getAndSetCurrentContext(sc, itemType, "", pageContext, defaultContext, false)</code>.
     183    @see #getAndSetCurrentContext(SessionControl, Item, String, PageContext, ItemContext, boolean)
    184184  */
    185185  public static ItemContext getAndSetCurrentContext(SessionControl sc, Item itemType, PageContext pageContext, ItemContext defaultContext)
    186186  {
    187     return getAndSetCurrentContext(sc, itemType, "", pageContext, defaultContext);
     187    return getAndSetCurrentContext(sc, itemType, "", pageContext, defaultContext, false);
     188  }
     189 
     190  /**
     191    Same as: <code>getAndSetCurrentContext(sc, itemType, "", pageContext, defaultContext, resetTemporary)</code>.
     192    @see #getAndSetCurrentContext(SessionControl, Item, String, PageContext, ItemContext, boolean)
     193  */
     194  public static ItemContext getAndSetCurrentContext(SessionControl sc, Item itemType, PageContext pageContext, ItemContext defaultContext, boolean resetTemporary)
     195  {
     196    return getAndSetCurrentContext(sc, itemType, "", pageContext, defaultContext, resetTemporary);
     197  }
     198 
     199  /**
     200    Same as: <code>getAndSetCurrentContext(sc, itemType, subContext, pageContext, defaultContext, false)</code>.
     201    @see #getAndSetCurrentContext(SessionControl, Item, String, PageContext, ItemContext, boolean)
     202  */
     203  public static ItemContext getAndSetCurrentContext(SessionControl sc, Item itemType, String subContext, PageContext pageContext, ItemContext defaultContext)
     204  {
     205    return getAndSetCurrentContext(sc, itemType, subContext, pageContext, defaultContext, false);
    188206  }
    189207 
    … …  
    306324    @param defaultContext A default context to copy information from if a current context
    307325      doesn't exist
     326    @param resetTemporary If information of temporary nature should be reset or not, for
     327      example the 'exclude' filter which is only used in popup windows
    308328  */
    309329  @SuppressWarnings("unchecked")
    310   public static ItemContext getAndSetCurrentContext(SessionControl sc, Item itemType, String subContext, PageContext pageContext, ItemContext defaultContext)
     330  public static ItemContext getAndSetCurrentContext(SessionControl sc, Item itemType, String subContext, PageContext pageContext, ItemContext defaultContext, boolean resetTemporary)
    311331  {
    312332    ItemContext cc = sc.getCurrentContext(itemType, subContext, defaultContext);
    … …  
    323343      extraValueContext = sc.getCurrentContext(Item.EXTRAVALUE, subContext);
    324344    }
    325      
     345   
     346    if (resetTemporary)
     347    {
     348      // Clear the 'exclude' option
     349      cc.removeObject("exclude");
     350    }
     351   
    326352    // Detect if active project has changed and then set the include option
    327353    int projectId = sc.getActiveProjectId();

  • trunk/www/admin/annotationtypecategories/index.jsp

    r2753 r2811  
    8686  {
    8787    // Display the list page without updating the current context
    88     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     88    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8989    redirect = listPage;
    9090  }

  • trunk/www/admin/annotationtypes/index.jsp

    r2753 r2811  
    8686  {
    8787    // Display the list page without updatinging the current context
    88     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     88    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8989    redirect = listPage;
    9090  }

  • trunk/www/admin/clients/help/index.jsp

    r2753 r2811  
    7777  {
    7878    // Display the list page without updatinging the current context
    79     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     79    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8080    redirect = listPage;
    8181  }

  • trunk/www/admin/clients/index.jsp

    r2753 r2811  
    8080  {
    8181    // Display the list page without updatinging the current context
    82     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     82    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8383    redirect = listPage;
    8484  }

  • trunk/www/admin/extravaluetypes/index.jsp

    r2753 r2811  
    8181  {
    8282    // Display the list page without updatinging the current context
    83     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     83    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8484    redirect = listPage;
    8585  }

  • trunk/www/admin/filetypes/index.jsp

    r2753 r2811  
    7979  {
    8080    // Display the list page without updatinging the current context
    81     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     81    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8282    redirect = listPage;
    8383  }

  • trunk/www/admin/groups/index.jsp

    r2753 r2811  
    8181  {
    8282    // Display the list page without updatinging the current context
    83     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     83    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8484    redirect = listPage;
    8585  }

  • trunk/www/admin/hardware/index.jsp

    r2753 r2811  
    8181  {
    8282    // Display the list page without updatinging the current context
    83     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     83    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8484    redirect = listPage;
    8585  }

  • trunk/www/admin/hardwaretypes/index.jsp

    r2753 r2811  
    7979  {
    8080    // Display the list page without updatinging the current context
    81     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     81    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8282    redirect = listPage;
    8383  }

  • trunk/www/admin/jobagents/index.jsp

    r2753 r2811  
    8383  {
    8484    // Display the list page without updatinging the current context
    85     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     85    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8686    redirect = listPage;
    8787  }

  • trunk/www/admin/mimetypes/index.jsp

    r2753 r2811  
    8080  {
    8181    // Display the list page without updatinging the current context
    82     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     82    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8383    redirect = listPage;
    8484  }

  • trunk/www/admin/news/index.jsp

    r2753 r2811  
    8383  {
    8484    // Display the list page without updatinging the current context
    85     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     85    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8686    redirect = listPage;
    8787  }

  • trunk/www/admin/pluginconfigurations/index.jsp

    r2753 r2811  
    8282  {
    8383    // Display the list page without updatinging the current context
    84     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     84    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8585    redirect = listPage;
    8686  }

  • trunk/www/admin/plugindefinitions/index.jsp

    r2802 r2811  
    8686  {
    8787    // Display the list page without updatinging the current context
    88     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     88    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8989    redirect = listPage;
    9090  }

  • trunk/www/admin/plugintypes/index.jsp

    r2753 r2811  
    7979  {
    8080    // Display the list page without updatinging the current context
    81     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     81    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8282    redirect = listPage;
    8383  }

  • trunk/www/admin/protocols/index.jsp

    r2753 r2811  
    8282  {
    8383    // Display the list page without updatinging the current context
    84     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     84    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8585    redirect = listPage;
    8686  }

  • trunk/www/admin/protocoltypes/index.jsp

    r2753 r2811  
    7979  {
    8080    // Display the list page without updatinging the current context
    81     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     81    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8282    redirect = listPage;
    8383  }

  • trunk/www/admin/quota/index.jsp

    r2753 r2811  
    8282  {
    8383    // Display the list page without updatinging the current context
    84     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     84    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8585    redirect = listPage;
    8686  }

  • trunk/www/admin/quotatypes/index.jsp

    r2753 r2811  
    7979  {
    8080    // Display the list page without updatinging the current context
    81     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     81    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8282    redirect = listPage;
    8383  }

  • trunk/www/admin/reportertypes/index.jsp

    r2753 r2811  
    7979  {
    8080    // Display the list page without updatinging the current context
    81     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     81    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8282    redirect = listPage;
    8383  }

  • trunk/www/admin/roles/index.jsp

    r2753 r2811  
    8383  {
    8484    // Display the list page without updatinging the current context
    85     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     85    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8686    redirect = listPage;
    8787  }

  • trunk/www/admin/software/index.jsp

    r2753 r2811  
    8181  {
    8282    // Display the list page without updatinging the current context
    83     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     83    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8484    redirect = listPage;
    8585  }

  • trunk/www/admin/softwaretypes/index.jsp

    r2753 r2811  
    7979  {
    8080    // Display the list page without updatinging the current context
    81     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     81    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8282    redirect = listPage;
    8383  }

  • trunk/www/admin/users/index.jsp

    r2753 r2811  
    8484  {
    8585    // Display the list page without updatinging the current context
    86     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     86    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8787    redirect = listPage;
    8888  }

  • trunk/www/biomaterials/biosources/index.jsp

    r2753 r2811  
    8181  {
    8282    // Display the list page without updatinging the current context
    83     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     83    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8484    redirect = listPage;
    8585  }

  • trunk/www/biomaterials/events/index.jsp

    r2753 r2811  
    8080  {
    8181    // Display the list page without updatinging the current context
    82     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     82    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8383    redirect = listPage;
    8484  }

  • trunk/www/biomaterials/extracts/index.jsp

    r2753 r2811  
    8484  {
    8585    // Display the list page without updatinging the current context
    86     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     86    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8787    redirect = listPage;
    8888  }

  • trunk/www/biomaterials/labeledextracts/index.jsp

    r2753 r2811  
    8585  {
    8686    // Display the list page without updatinging the current context
    87     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     87    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8888    redirect = listPage;
    8989  }

  • trunk/www/biomaterials/labels/index.jsp

    r2753 r2811  
    8181  {
    8282    // Display the list page without updatinging the current context
    83     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     83    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8484    redirect = listPage;
    8585  }

  • trunk/www/biomaterials/samples/index.jsp

    r2753 r2811  
    8484  {
    8585    // Display the list page without updatinging the current context
    86     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     86    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8787    redirect = listPage;
    8888  }

  • trunk/www/filemanager/directories/index.jsp

    r2753 r2811  
    8080  {
    8181    // Display the list page without updating the current context
    82     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     82    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8383    redirect = listPage;
    8484  }

  • trunk/www/filemanager/files/index.jsp

    r2753 r2811  
    8888  {
    8989    // Display the list page without updating the current context
    90     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     90    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    9191    redirect = listPage;
    9292  }

  • trunk/www/filemanager/index.jsp

    r2753 r2811  
    5656  {
    5757    // Display the list page without updatinging the current context
    58     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     58    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    5959    forward = "manager.jsp";
    6060  }

  • trunk/www/lims/arraybatches/index.jsp

    r2753 r2811  
    8484  {
    8585    // Display the list page without updatinging the current context
    86     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     86    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8787    redirect = listPage;
    8888  }

  • trunk/www/lims/arraydesigns/features/index.jsp

    r2753 r2811  
    6767  {
    6868    // Display the list page without updatinging the current context
    69     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     69    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    7070    redirect = listPage;
    7171  }

  • trunk/www/lims/arraydesigns/index.jsp

    r2753 r2811  
    8585  {
    8686    // Display the list page without updatinging the current context
    87     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     87    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8888    redirect = listPage;
    8989  }

  • trunk/www/lims/arrayslides/index.jsp

    r2753 r2811  
    8585  {
    8686    // Display the list page without updatinging the current context
    87     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     87    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8888    redirect = listPage;
    8989  }

  • trunk/www/lims/geometries/index.jsp

    r2753 r2811  
    8080  {
    8181    // Display the list page without updatinging the current context
    82     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     82    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8383    redirect = listPage;
    8484  }

  • trunk/www/lims/platemappings/index.jsp

    r2753 r2811  
    8282  {
    8383    // Display the list page without updatinging the current context
    84     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     84    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8585    redirect = listPage;
    8686  }

  • trunk/www/lims/plates/events/index.jsp

    r2753 r2811  
    8080  {
    8181    // Display the list page without updatinging the current context
    82     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     82    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8383    redirect = listPage;
    8484  }

  • trunk/www/lims/plates/index.jsp

    r2753 r2811  
    8484  {
    8585    // Display the list page without updatinging the current context
    86     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     86    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8787    redirect = listPage;
    8888  }

  • trunk/www/lims/plates/wells/index.jsp

    r2753 r2811  
    7777  {
    7878    // Display the list page without updatinging the current context
    79     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     79    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8080    redirect = listPage;
    8181  }

  • trunk/www/lims/platetypes/eventtypes/index.jsp

    r2753 r2811  
    7878  {
    7979    // Display the list page without updatinging the current context
    80     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     80    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8181    redirect = listPage;
    8282  }

  • trunk/www/lims/platetypes/index.jsp

    r2753 r2811  
    8282  {
    8383    // Display the list page without updatinging the current context
    84     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     84    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8585    redirect = listPage;
    8686  }

  • trunk/www/my_base/messages/index.jsp

    r2753 r2811  
    8282  {
    8383    // Display the list page without updatinging the current context
    84     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     84    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8585    redirect = listPage;
    8686  }

  • trunk/www/my_base/projects/index.jsp

    r2753 r2811  
    8383  {
    8484    // Display the list page without updatinging the current context
    85     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     85    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8686    redirect = listPage;
    8787  }

  • trunk/www/views/experiments/bioassays/index.jsp

    r2753 r2811  
    9292  {
    9393    // Display the list page without updatinging the current context
    94     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     94    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    9595    redirect = listPage;
    9696  }

  • trunk/www/views/experiments/bioassaysets/index.jsp

    r2753 r2811  
    115115  {
    116116    // Display the list page without updatinging the current context
    117     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     117    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    118118    if (transformationId != null)
    119119    {

  • trunk/www/views/experiments/index.jsp

    r2753 r2811  
    8787  {
    8888    // Display the list page without updatinging the current context
    89     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     89    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    9090    redirect = listPage;
    9191  }

  • trunk/www/views/formulas/index.jsp

    r2753 r2811  
    8585  {
    8686    // Display the list page without updatinging the current context
    87     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     87    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8888    redirect = listPage;
    8989  }

  • trunk/www/views/hybridizations/index.jsp

    r2753 r2811  
    8686  {
    8787    // Display the list page without updatinging the current context
    88     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     88    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8989    redirect = listPage;
    9090  }

  • trunk/www/views/jobs/index.jsp

    r2753 r2811  
    8181  {
    8282    // Display the list page without updatinging the current context
    83     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     83    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8484    redirect = listPage;
    8585  }

  • trunk/www/views/rawbioassays/index.jsp

    r2753 r2811  
    100100  {
    101101    // Display the list page without updatinging the current context
    102     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     102    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    103103    redirect = listPage;
    104104  }

  • trunk/www/views/reporterlists/index.jsp

    r2753 r2811  
    8989  {
    9090    // Display the list page without updatinging the current context
    91     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     91    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    9292    redirect = listPage;
    9393  }

  • trunk/www/views/reporterlists/reporters/index.jsp

    r2753 r2811  
    8585  {
    8686    // Display the list page without updatinging the current context
    87     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     87    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8888    redirect = listPage;
    8989  }

  • trunk/www/views/reporters/index.jsp

    r2753 r2811  
    7878  {
    7979    // Display the list page without updatinging the current context
    80     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     80    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8181    redirect = listPage;
    8282  }

  • trunk/www/views/scans/images/index.jsp

    r2753 r2811  
    7878  {
    7979    // Display the list page without updatinging the current context
    80     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     80    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8181    redirect = listPage;
    8282  }

  • trunk/www/views/scans/index.jsp

    r2753 r2811  
    8484  {
    8585    // Display the list page without updatinging the current context
    86     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     86    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    8787    redirect = listPage;
    8888  }

  • trunk/www/views/sessions/index.jsp

    r2753 r2811  
    8787  {
    8888    // Display the list page without updatinging the current context
    89     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     89    Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
    9090    redirect = listPage;
    9191  }
Note: See TracChangeset for help on using the changeset viewer.