Changeset 3890


Ignore:
Timestamp:
Oct 30, 2007, 10:49:39 AM (14 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #707: Can't unlink items that have been put in the trashcan

Location:
trunk/www
Files:
40 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/admin/annotationtypecategories/edit_category.jsp

    r3675 r3890  
    3232  import="net.sf.basedb.core.Type"
    3333  import="net.sf.basedb.core.ItemContext"
     34  import="net.sf.basedb.core.Include"
    3435  import="net.sf.basedb.core.ItemQuery"
    3536  import="net.sf.basedb.core.Permission"
     
    8485  {
    8586    annotationTypeQuery = annotationTypeCategory.getAnnotationTypes(null);
     87    annotationTypeQuery.include(Include.ALL);
    8688    annotationTypeQuery.order(Orders.asc(Hql.property("name")));
    8789  }
     
    9092  final String requiredClazz = "class=\"text required\"";
    9193  %>
    92 
    9394  <base:page type="popup" title="<%=title%>">
    9495  <base:head scripts="tabcontrol.js,linkitems.js" styles="tabcontrol.css">
     
    183184
    184185    <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    185     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*270)+"px;"%>" position="bottom">
     186    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*280)+"px;"%>" position="bottom">
    186187    <t:tab id="info" title="Annotation type category" validate="validateAnnotationTypeCategory()"
    187188      helpid="annotationtypecategory.edit">
     
    212213    <td>
    213214      <b>Annotation types</b><br>
    214       <select name="members" size="15" multiple
     215      <select name="members" size="14" multiple
    215216        style="width: 15em;">
    216217      </select>
  • trunk/www/admin/annotationtypecategories/view_category.jsp

    r3675 r3890  
    226226      <%
    227227        ItemQuery<AnnotationType> annotationTypeQuery = annotationTypeCategory.getAnnotationTypes(null);
    228         annotationTypeQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     228        annotationTypeQuery.include(Include.ALL);
    229229        annotationTypeQuery.order(Orders.asc(Hql.property("name")));
    230230        ItemResultList<AnnotationType> annotationTypes = annotationTypeQuery.list(dc);
     
    272272            %>
    273273            <tbl:row>
    274               <tbl:cell column="name"><%=Base.getLinkedName(ID, annotationType, false, true)%></tbl:cell>
     274              <tbl:cell column="name"><base:icon
     275                  image="deleted.gif"
     276                  tooltip="This item has been scheduled for deletion"
     277                  visible="<%=annotationType.isRemoved()%>"
     278                /><%=Base.getLinkedName(ID, annotationType, false, true)%></tbl:cell>
    275279              <tbl:cell column="valuetype"><%=annotationType.getValueType()%></tbl:cell>
    276280              <tbl:cell column="description"><%=HTML.encodeTags(annotationType.getDescription())%></tbl:cell>
     
    325329              <tbl:row>
    326330                <tbl:cell column="itemType"><%=project.getType()%></tbl:cell>
    327                 <tbl:cell column="name"><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
     331                <tbl:cell column="name"><base:icon
     332                  image="deleted.gif"
     333                  tooltip="This item has been scheduled for deletion"
     334                  visible="<%=project.isRemoved()%>"
     335                /><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
    328336                <tbl:cell column="permissions">
    329337                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    339347              <tbl:row>             
    340348                <tbl:cell column="itemType"><%=group.getType()%></tbl:cell>
    341                 <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     349                <tbl:cell column="name"><base:icon
     350                  image="deleted.gif"
     351                  tooltip="This item has been scheduled for deletion"
     352                  visible="<%=group.isRemoved()%>"
     353                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    342354                <tbl:cell column="permissions">
    343355                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    353365              <tbl:row>             
    354366                <tbl:cell column="itemType"><%=user.getType()%></tbl:cell>
    355                 <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     367                <tbl:cell column="name"><base:icon
     368                  image="deleted.gif"
     369                  tooltip="This item has been scheduled for deletion"
     370                  visible="<%=user.isRemoved()%>"
     371                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    356372                <tbl:cell column="permissions">
    357373                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
  • trunk/www/admin/annotationtypes/edit_annotationtype.jsp

    r3679 r3890  
    3333  import="net.sf.basedb.core.Type"
    3434  import="net.sf.basedb.core.ItemContext"
     35  import="net.sf.basedb.core.Include"
    3536  import="net.sf.basedb.core.Permission"
    3637  import="net.sf.basedb.core.AnnotationType"
     
    8485    title = "Edit annotation type -- " + HTML.encodeTags(annotationType.getName());
    8586    categoryQuery = annotationType.getCategories();
     87    categoryQuery.include(Include.ALL);
    8688    categoryQuery.order(Orders.asc(Hql.property("name")));
    8789  }
     
    9496  String htmlDateFormat = HTML.encodeTags(dateFormat);
    9597  %>
    96 
    9798  <base:page type="popup" title="<%=title%>">
    9899  <base:head scripts="tabcontrol.js,linkitems.js" styles="tabcontrol.css">
     
    251252
    252253    <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    253     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*270)+"px;"%>"
     254    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*300)+"px;"%>"
    254255      position="bottom" remember="<%=annotationType != null%>">
    255256    <t:tab id="info" title="Annotation type" validate="validateAnnotationType()" helpid="annotationtype.edit">
     
    653654      <td>
    654655        <b>Enabled for</b><br>
    655         <select name="enabled" multiple size="15" style="width: 12em;"
     656        <select name="enabled" multiple size="14" style="width: 12em;"
    656657          ondblclick="moveBetween(document.forms['annotationType'].enabled, document.forms['annotationType'].disabled)">
    657658        </select>
     
    675676      <td>
    676677        <b>Disabled for</b><br>
    677         <select name="disabled" multiple size="15" style="width: 12em;"
     678        <select name="disabled" multiple size="14" style="width: 12em;"
    678679          ondblclick="moveBetween(document.forms['annotationType'].disabled, document.forms['annotationType'].enabled)">
    679680        </select>
     
    689690      <td>
    690691        <b>Categories</b><br>
    691         <select name="categories" size="15" multiple
     692        <select name="categories" size="14" multiple
    692693          style="width: 15em;">
    693694        </select>
  • trunk/www/admin/annotationtypes/view_annotationtype.jsp

    r3679 r3890  
    268268      ItemQuery<AnnotationTypeCategory> categoryQuery =
    269269        annotationType.getCategories();
    270       categoryQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     270      categoryQuery.include(Include.ALL);
    271271      categoryQuery.order(Orders.asc(Hql.property("name")));
    272272      ItemResultList<AnnotationTypeCategory> categories = categoryQuery.list(dc);
     
    306306            %>
    307307            <tbl:row>
    308               <tbl:cell column="name"><%=Base.getLinkedName(ID, category, false, true)%></tbl:cell>
     308              <tbl:cell column="name"><base:icon
     309                  image="deleted.gif"
     310                  tooltip="This item has been scheduled for deletion"
     311                  visible="<%=category.isRemoved()%>"
     312                /><%=Base.getLinkedName(ID, category, false, true)%></tbl:cell>
    309313              <tbl:cell column="description"><%=HTML.encodeTags(category.getDescription())%></tbl:cell>
    310314            </tbl:row>
     
    357361              <tbl:row>
    358362                <tbl:cell column="itemType"><%=project.getType()%></tbl:cell>
    359                 <tbl:cell column="name"><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
     363                <tbl:cell column="name"><base:icon
     364                  image="deleted.gif"
     365                  tooltip="This item has been scheduled for deletion"
     366                  visible="<%=project.isRemoved()%>"
     367                /><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
    360368                <tbl:cell column="permissions">
    361369                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    371379              <tbl:row>             
    372380                <tbl:cell column="itemType"><%=group.getType()%></tbl:cell>
    373                 <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     381                <tbl:cell column="name"><base:icon
     382                  image="deleted.gif"
     383                  tooltip="This item has been scheduled for deletion"
     384                  visible="<%=group.isRemoved()%>"
     385                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    374386                <tbl:cell column="permissions">
    375387                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    385397              <tbl:row>             
    386398                <tbl:cell column="itemType"><%=user.getType()%></tbl:cell>
    387                 <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     399                <tbl:cell column="name"><base:icon
     400                  image="deleted.gif"
     401                  tooltip="This item has been scheduled for deletion"
     402                  visible="<%=user.isRemoved()%>"
     403                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    388404                <tbl:cell column="permissions">
    389405                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
  • trunk/www/admin/clients/view_client.jsp

    r3679 r3890  
    277277              <tbl:row>
    278278                <tbl:cell column="itemType"><%=project.getType()%></tbl:cell>
    279                 <tbl:cell column="name"><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
     279                <tbl:cell column="name"><base:icon
     280                  image="deleted.gif"
     281                  tooltip="This item has been scheduled for deletion"
     282                  visible="<%=project.isRemoved()%>"
     283                /><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
    280284                <tbl:cell column="permissions">
    281285                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    291295              <tbl:row>             
    292296                <tbl:cell column="itemType"><%=group.getType()%></tbl:cell>
    293                 <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     297                <tbl:cell column="name"><base:icon
     298                  image="deleted.gif"
     299                  tooltip="This item has been scheduled for deletion"
     300                  visible="<%=group.isRemoved()%>"
     301                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    294302                <tbl:cell column="permissions">
    295303                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    305313              <tbl:row>             
    306314                <tbl:cell column="itemType"><%=user.getType()%></tbl:cell>
    307                 <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     315                <tbl:cell column="name"><base:icon
     316                  image="deleted.gif"
     317                  tooltip="This item has been scheduled for deletion"
     318                  visible="<%=user.isRemoved()%>"
     319                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    308320                <tbl:cell column="permissions">
    309321                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
  • trunk/www/admin/datafiletypes/edit_filetype.jsp

    r3820 r3890  
    1 <%-- $Id$
     1<%-- $Id:edit_filetype.jsp 3820 2007-10-12 10:03:18Z nicklas $
    22  ------------------------------------------------------------------
    33  Copyright (C) 2005 Nicklas Nordborg
  • trunk/www/admin/datafiletypes/view_filetype.jsp

    r3860 r3890  
    7979
    8080  <%@page import="net.sf.basedb.core.PlatformFileType"%>
     81<%@page import="net.sf.basedb.core.Include"%>
    8182<base:page title="<%=title%>">
    8283  <base:head scripts="tabcontrol.js" styles="toolbar.css,headertabcontrol.css,path.css,table.css">
     
    220221      <%
    221222      ItemQuery<PlatformFileType> platformQuery = fileType.getPlatforms();
     223      platformQuery.include(Include.ALL);
    222224      platformQuery.order(Orders.asc(Hql.property("platform.name")));
    223225      ItemResultList<PlatformFileType> platforms = platformQuery.list(dc);
     
    262264            %>
    263265            <tbl:row>
    264               <tbl:cell column="platform"><%=Base.getLinkedName(ID, p, false, true)%></tbl:cell>
    265               <tbl:cell column="variant"><%=v == null ? "<i>- all -</i>" : Base.getLinkedName(ID, v, false, true)%></tbl:cell>
     266              <tbl:cell column="platform"><base:icon
     267                  image="deleted.gif"
     268                  tooltip="This item has been scheduled for deletion"
     269                  visible="<%=p.isRemoved()%>"
     270                /><%=Base.getLinkedName(ID, p, false, true)%></tbl:cell>
     271              <tbl:cell column="variant"><base:icon
     272                  image="deleted.gif"
     273                  tooltip="This item has been scheduled for deletion"
     274                  visible="<%=v!= null && v.isRemoved()%>"
     275                /><%=v == null ? "<i>- all -</i>" : Base.getLinkedName(ID, v, false, true)%></tbl:cell>
    266276              <tbl:cell column="required"><%=item.isRequired() ? "yes" : "no"%></tbl:cell>
    267277            </tbl:row>
  • trunk/www/admin/diskusage/list_groups.jsp

    r3675 r3890  
    9595  {
    9696    final ItemQuery<Group> query = Base.getConfiguredQuery(cc, true, Group.getQuery(), mode);
     97    query.include(Include.ALL);
    9798    query.restrict(
    9899        Restrictions.neq(
  • trunk/www/admin/diskusage/list_users.jsp

    r3675 r3890  
    9898  {
    9999    final ItemQuery<User> query = Base.getConfiguredQuery(cc, true, User.getQuery(), mode);
     100    query.include(Include.ALL);
    100101    users = query.iterate(dc);
    101102  }
  • trunk/www/admin/extravaluetypes/edit_extravaluetype.jsp

    r3675 r3890  
    204204
    205205    <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    206     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*240)+"px;"%>"
     206    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*280)+"px;"%>"
    207207      position="bottom" remember="<%=extraValueType != null%>">
    208208    <t:tab id="info" title="Extra value type" validate="validateExtraValueType()"
  • trunk/www/admin/groups/edit_group.jsp

    r3679 r3890  
    3535  import="net.sf.basedb.core.Type"
    3636  import="net.sf.basedb.core.ItemContext"
     37  import="net.sf.basedb.core.Include"
    3738  import="net.sf.basedb.core.Permission"
    3839  import="net.sf.basedb.core.Group"
     
    9091    {
    9192      userQuery = User.getQuery();
     93      userQuery.include(Include.ALL);
    9294      userQuery.restrict(Restrictions.in(Hql.property("id"), Expressions.parameter("selected")));
    9395      userQuery.setParameter("selected", Arrays.asList(Values.getInt(selected)), Type.INT);
     
    111113   
    112114    groupQuery = group.getGroups();
     115    groupQuery.include(Include.ALL);
    113116    groupQuery.order(Orders.asc(Hql.property("name")));
    114117    userQuery = group.getUsers();
     118    userQuery.include(Include.ALL);
    115119    userQuery.order(Orders.asc(Hql.property("name")));
    116120  }
     
    128132  // Query to retrieve quota
    129133  final ItemQuery<Quota> quotaQuery = Quota.getQuery();
     134  quotaQuery.include(Include.ALL);
    130135  quotaQuery.order(Orders.asc(Hql.property("name")));
    131136  quotaQuery.setCacheResult(true);
     
    134139  final String requiredClazz = "class=\"text required\"";
    135140  %>
    136 
    137141  <base:page type="popup" title="<%=title%>">
    138142  <base:head scripts="tabcontrol.js,linkitems.js" styles="tabcontrol.css">
     
    291295            {
    292296              boolean current = quota.equals(currentQuota);
     297              if (!current && quota.isRemoved()) continue;
    293298              int id = quota.getId();
    294299              long totalBytes = quota.getQuotaValue(total, Location.PRIMARY);
     
    324329    <td>
    325330      <b>Members</b><br>
    326       <select name="members" size="15" multiple <%=isEveryone || !writeMembers ? "disabled readonly class=\"disabled\"" : ""%> style="width: 15em;">
     331      <select name="members" size="14" multiple <%=isEveryone || !writeMembers ? "disabled readonly class=\"disabled\"" : ""%> style="width: 15em;">
    327332      </select>
    328333      <input type="hidden" name="removeUsers" value="">
  • trunk/www/admin/groups/view_group.jsp

    r3679 r3890  
    199199      <%
    200200      ItemQuery<User> userQuery = group.getUsers();
    201       userQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     201      userQuery.include(Include.ALL);
    202202      userQuery.order(Orders.asc(Hql.property("name")));
    203203      ItemResultList<User> users = userQuery.list(dc);
    204204     
    205205      ItemQuery<Group> groupQuery = group.getGroups();
    206       groupQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     206      groupQuery.include(Include.ALL);
    207207      groupQuery.order(Orders.asc(Hql.property("name")));
    208208      ItemResultList<Group> groups = groupQuery.list(dc);
     
    245245            %>
    246246            <tbl:row>
    247               <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     247              <tbl:cell column="name"><base:icon
     248                  image="deleted.gif"
     249                  tooltip="This item has been scheduled for deletion"
     250                  visible="<%=user.isRemoved()%>"
     251                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    248252              <tbl:cell column="type">User</tbl:cell>
    249253              <tbl:cell column="description"><%=HTML.encodeTags(user.getDescription())%></tbl:cell>
     
    255259            %>
    256260            <tbl:row>
    257               <tbl:cell column="name"><%=Base.getLinkedName(ID, child, false, true)%></tbl:cell>
     261              <tbl:cell column="name"><base:icon
     262                  image="deleted.gif"
     263                  tooltip="This item has been scheduled for deletion"
     264                  visible="<%=child.isRemoved()%>"
     265                /><%=Base.getLinkedName(ID, child, false, true)%></tbl:cell>
    258266              <tbl:cell column="type">Group</tbl:cell>
    259267              <tbl:cell column="description"><%=HTML.encodeTags(child.getDescription())%></tbl:cell>
  • trunk/www/admin/hardware/edit_hardware.jsp

    r3679 r3890  
    147147
    148148    <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    149     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*160)+"px;"%>"
     149    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*180)+"px;"%>"
    150150      position="bottom"  remember="<%=hardware != null%>">
    151151    <t:tab id="info" title="Hardware" validate="validateHardware()" helpid="hardware.edit">
  • trunk/www/admin/hardware/view_hardware.jsp

    r3679 r3890  
    268268              <tbl:row>
    269269                <tbl:cell column="itemType"><%=project.getType()%></tbl:cell>
    270                 <tbl:cell column="name"><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
     270                <tbl:cell column="name"><base:icon
     271                  image="deleted.gif"
     272                  tooltip="This item has been scheduled for deletion"
     273                  visible="<%=project.isRemoved()%>"
     274                /><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
    271275                <tbl:cell column="permissions">
    272276                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    282286              <tbl:row>             
    283287                <tbl:cell column="itemType"><%=group.getType()%></tbl:cell>
    284                 <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     288                <tbl:cell column="name"><base:icon
     289                  image="deleted.gif"
     290                  tooltip="This item has been scheduled for deletion"
     291                  visible="<%=group.isRemoved()%>"
     292                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    285293                <tbl:cell column="permissions">
    286294                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    296304              <tbl:row>             
    297305                <tbl:cell column="itemType"><%=user.getType()%></tbl:cell>
    298                 <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     306                <tbl:cell column="name"><base:icon
     307                  image="deleted.gif"
     308                  tooltip="This item has been scheduled for deletion"
     309                  visible="<%=user.isRemoved()%>"
     310                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    299311                <tbl:cell column="permissions">
    300312                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
  • trunk/www/admin/hardwaretypes/view_hardwaretype.jsp

    r3679 r3890  
    194194      <%
    195195      ItemQuery<Hardware> hardwareQuery = hardwareType.getHardware();
    196       hardwareQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     196      hardwareQuery.include(Include.ALL);
    197197      hardwareQuery.order(Orders.asc(Hql.property("name")));
    198198      ItemResultList<Hardware> hardware = hardwareQuery.list(dc);
     
    235235            %>
    236236            <tbl:row>
    237               <tbl:cell column="name"><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell>
     237              <tbl:cell column="name"><base:icon
     238                  image="deleted.gif"
     239                  tooltip="This item has been scheduled for deletion"
     240                  visible="<%=item.isRemoved()%>"
     241                /><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell>
    238242              <tbl:cell column="version"><%=HTML.encodeTags(item.getVersionString())%></tbl:cell>
    239243              <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
  • trunk/www/admin/jobagents/edit_agent.jsp

    r3675 r3890  
    6565  // Query to retrieve installed plugins
    6666  ItemQuery<PluginDefinition> pluginQuery = PluginDefinition.getQuery();
    67   pluginQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);
     67  pluginQuery.include(Include.ALL);
    6868  pluginQuery.order(Orders.asc(Hql.property("name")));
    6969
     
    409409
    410410    <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    411     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*260)+"px;"%>"
     411    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*280)+"px;"%>"
    412412      position="bottom"  remember="<%=agent != null%>" active="<%=selectedPluginId == -1 ? null : "plugins" %>">
    413413    <t:tab id="info" title="Job agent" validate="validateJobAgent()" helpid="jobagent.edit">
     
    460460      <td>
    461461        <b>Installed plugins</b><br>
    462         <select name="plugins" size="15" multiple style="width: 15em;"
     462        <select name="plugins" size="14" multiple style="width: 15em;"
    463463          onclick="pluginsOnClick()">
    464464        </select>
  • trunk/www/admin/jobagents/view_agent.jsp

    r3775 r3890  
    3232  import="net.sf.basedb.core.Item"
    3333  import="net.sf.basedb.core.ItemContext"
     34  import="net.sf.basedb.core.Include"
    3435  import="net.sf.basedb.core.Permission"
    3536  import="net.sf.basedb.core.Job"
     
    290291      <%
    291292      ItemQuery<JobAgentSettings> query = agent.getSettings();
     293      query.include(Include.ALL);
    292294      query.order(Orders.asc(Hql.property("pluginDefinition.name")));
    293295      ItemResultList<JobAgentSettings> plugins = query.list(dc);
     
    356358            %>
    357359            <tbl:row>
    358               <tbl:cell column="plugin"><%=Base.getLinkedName(ID, nameableProxy, !readPlugin, true)%></tbl:cell>
     360              <tbl:cell column="plugin"><base:icon
     361                  image="deleted.gif"
     362                  tooltip="This item has been scheduled for deletion"
     363                  visible="<%=plugin != null && plugin.isRemoved()%>"
     364                /><%=Base.getLinkedName(ID, nameableProxy, !readPlugin, true)%></tbl:cell>
    359365              <tbl:cell column="jarPath"><%=jarPath == null ? "<i>- internal -</i>" : HTML.encodeTags(jarPath)%></tbl:cell>
    360366              <tbl:cell column="trusted"><%=settings.isEffectivelyTrusted()%></tbl:cell>
     
    540546              <tbl:row>
    541547                <tbl:cell column="itemType"><%=project.getType()%></tbl:cell>
    542                 <tbl:cell column="name"><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
     548                <tbl:cell column="name"><base:icon
     549                  image="deleted.gif"
     550                  tooltip="This item has been scheduled for deletion"
     551                  visible="<%=project.isRemoved()%>"
     552                /><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
    543553                <tbl:cell column="permissions">
    544554                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    554564              <tbl:row>             
    555565                <tbl:cell column="itemType"><%=group.getType()%></tbl:cell>
    556                 <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     566                <tbl:cell column="name"><base:icon
     567                  image="deleted.gif"
     568                  tooltip="This item has been scheduled for deletion"
     569                  visible="<%=group.isRemoved()%>"
     570                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    557571                <tbl:cell column="permissions">
    558572                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    568582              <tbl:row>             
    569583                <tbl:cell column="itemType"><%=user.getType()%></tbl:cell>
    570                 <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     584                <tbl:cell column="name"><base:icon
     585                  image="deleted.gif"
     586                  tooltip="This item has been scheduled for deletion"
     587                  visible="<%=user.isRemoved()%>"
     588                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    571589                <tbl:cell column="permissions">
    572590                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
  • trunk/www/admin/platforms/edit_platform.jsp

    r3867 r3890  
    3232  import="net.sf.basedb.core.Item"
    3333  import="net.sf.basedb.core.ItemContext"
     34  import="net.sf.basedb.core.Include"
    3435  import="net.sf.basedb.core.Permission"
    3536  import="net.sf.basedb.core.Platform"
     
    7879    platform.checkPermission(Permission.WRITE);
    7980    fileTypeQuery = platform.getFileTypes(null, true);
     81    fileTypeQuery.include(Include.ALL);
    8082    fileTypeQuery.order(Orders.asc(Hql.property("dataFileType.name")));
    8183  }
     
    8587  final String unchangeableClazz = "class=\"text required unchangeable\"";
    8688  %>
    87 
    8889  <base:page type="popup" title="<%=title%>">
    8990  <base:head scripts="tabcontrol.js,linkitems.js" styles="tabcontrol.css">
  • trunk/www/admin/platforms/variants/edit_variant.jsp

    r3867 r3890  
    3232  import="net.sf.basedb.core.Item"
    3333  import="net.sf.basedb.core.ItemContext"
     34  import="net.sf.basedb.core.Include"
    3435  import="net.sf.basedb.core.Permission"
    3536  import="net.sf.basedb.core.Platform"
     
    8586    variant.checkPermission(Permission.WRITE);
    8687    fileTypeQuery = platform.getFileTypes(variant, true);
     88    fileTypeQuery.include(Include.ALL);
    8789    fileTypeQuery.order(Orders.asc(Hql.property("dataFileType.name")));
    8890  }
     
    9294  final String unchangeableClazz = "class=\"text required unchangeable\"";
    9395  %>
    94 
    9596  <base:page type="popup" title="<%=title%>">
    9697  <base:head scripts="tabcontrol.js,linkitems.js" styles="tabcontrol.css">
  • trunk/www/admin/platforms/variants/view_variant.jsp

    r3867 r3890  
    8181  %>
    8282
    83   <base:page title="<%=title%>">
     83  <%@page import="net.sf.basedb.core.Include"%>
     84<base:page title="<%=title%>">
    8485  <base:head scripts="table.js,tabcontrol.js" styles="toolbar.css,table.css,headertabcontrol.css,path.css">
    8586    <script language="JavaScript">
     
    226227      <%
    227228      ItemQuery<PlatformFileType> fileTypeQuery = platform.getFileTypes(variant, false);
     229      fileTypeQuery.include(Include.ALL);
    228230      fileTypeQuery.join(Hql.leftJoin("variant", "var"));
    229231      fileTypeQuery.order(Orders.asc(Hql.property("var", "name")));
     
    278280            %>
    279281            <tbl:row>
    280               <tbl:cell column="variant"><%=thisVariant == null ? "<i>- all -</i>" : Base.getLinkedName(ID, thisVariant, false, true)%></tbl:cell>
    281               <tbl:cell column="name"><%=Base.getLinkedName(ID, dft, false, true)%></tbl:cell>
     282              <tbl:cell column="variant"><base:icon
     283                  image="deleted.gif"
     284                  tooltip="This item has been scheduled for deletion"
     285                  visible="<%=thisVariant != null && thisVariant.isRemoved()%>"
     286                /><%=thisVariant == null ? "<i>- all -</i>" : Base.getLinkedName(ID, thisVariant, false, true)%></tbl:cell>
     287              <tbl:cell column="name"><base:icon
     288                  image="deleted.gif"
     289                  tooltip="This item has been scheduled for deletion"
     290                  visible="<%=dft != null && dft.isRemoved()%>"
     291                /><%=Base.getLinkedName(ID, dft, false, true)%></tbl:cell>
    282292              <tbl:cell column="required"><%=fileType.isRequired() ? "yes" : "no"%></tbl:cell>
    283293              <tbl:cell column="genericType"><base:propertyvalue item="<%=dft%>" property="genericType" /></tbl:cell>
  • trunk/www/admin/platforms/view_platform.jsp

    r3867 r3890  
    3131  import="net.sf.basedb.core.Item"
    3232  import="net.sf.basedb.core.ItemContext"
     33  import="net.sf.basedb.core.Include"
    3334  import="net.sf.basedb.core.Permission"
    3435  import="net.sf.basedb.core.Platform"
     
    251252      <%
    252253      ItemQuery<PlatformFileType> fileTypeQuery = platform.getFileTypes(null, false);
     254      fileTypeQuery.include(Include.ALL);
    253255      fileTypeQuery.join(Hql.leftJoin("variant", "var"));
    254256      fileTypeQuery.order(Orders.asc(Hql.property("var", "name")));
     
    303305            %>
    304306            <tbl:row>
    305               <tbl:cell column="variant"><%=variant == null ? "<i>- all -</i>" : Base.getLinkedName(ID, variant, false, true)%></tbl:cell>
    306               <tbl:cell column="name"><%=Base.getLinkedName(ID, dft, false, true)%></tbl:cell>
     307              <tbl:cell column="variant"><base:icon
     308                  image="deleted.gif"
     309                  tooltip="This item has been scheduled for deletion"
     310                  visible="<%=variant != null && variant.isRemoved()%>"
     311                /><%=variant == null ? "<i>- all -</i>" : Base.getLinkedName(ID, variant, false, true)%></tbl:cell>
     312              <tbl:cell column="name"><base:icon
     313                  image="deleted.gif"
     314                  tooltip="This item has been scheduled for deletion"
     315                  visible="<%=dft != null && dft.isRemoved()%>"
     316                /><%=Base.getLinkedName(ID, dft, false, true)%></tbl:cell>
    307317              <tbl:cell column="required"><%=fileType.isRequired() ? "yes" : "no"%></tbl:cell>
    308318              <tbl:cell column="genericType"><base:propertyvalue item="<%=dft%>" property="genericType" /></tbl:cell>
  • trunk/www/admin/pluginconfigurations/view_configuration.jsp

    r3775 r3890  
    324324              <tbl:row>
    325325                <tbl:cell column="itemType"><%=project.getType()%></tbl:cell>
    326                 <tbl:cell column="name"><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
     326                <tbl:cell column="name"><base:icon
     327                  image="deleted.gif"
     328                  tooltip="This item has been scheduled for deletion"
     329                  visible="<%=project.isRemoved()%>"
     330                /><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
    327331                <tbl:cell column="permissions">
    328332                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    338342              <tbl:row>             
    339343                <tbl:cell column="itemType"><%=group.getType()%></tbl:cell>
    340                 <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     344                <tbl:cell column="name"><base:icon
     345                  image="deleted.gif"
     346                  tooltip="This item has been scheduled for deletion"
     347                  visible="<%=group.isRemoved()%>"
     348                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    341349                <tbl:cell column="permissions">
    342350                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    352360              <tbl:row>             
    353361                <tbl:cell column="itemType"><%=user.getType()%></tbl:cell>
    354                 <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     362                <tbl:cell column="name"><base:icon
     363                  image="deleted.gif"
     364                  tooltip="This item has been scheduled for deletion"
     365                  visible="<%=user.isRemoved()%>"
     366                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    355367                <tbl:cell column="permissions">
    356368                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
  • trunk/www/admin/plugindefinitions/auto_install.jsp

    r3832 r3890  
    3131  import="net.sf.basedb.core.Item"
    3232  import="net.sf.basedb.core.ItemContext"
     33  import="net.sf.basedb.core.Include"
    3334  import="net.sf.basedb.core.ItemNotFoundException"
    3435  import="net.sf.basedb.core.ItemQuery"
     
    366367                  {
    367368                    ItemQuery<PluginConfiguration> cnfQuery = pd.getPluginConfigurations();
     369                    cnfQuery.include(Include.ALL);
    368370                    cnfQuery.restrict(Restrictions.eq(Hql.property("name"), Expressions.string(cnfInfo.getName())));
    369371                    Iterator<PluginConfiguration> it = cnfQuery.iterate(dc);
  • trunk/www/admin/plugindefinitions/edit_plugin.jsp

    r3871 r3890  
    153153
    154154    agentQuery = JobAgent.getQuery();
    155     agentQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     155    agentQuery.include(Include.ALL);
    156156    agentQuery.order(Orders.asc(Hql.property("name")));
    157157    agentQuery.join(Hql.innerJoin("plugins", "p"));
     
    722722
    723723    <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    724     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*300)+"px;"%>"
     724    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*320)+"px;"%>"
    725725      position="bottom" remember="<%=plugin != null%>" active="<%=selectedAgentId == -1 ? null : "agents" %>">
    726726    <t:tab id="info" title="Plugin" validate="validatePlugin()" helpid="plugindefinition.edit">
     
    816816    <td>
    817817      <b>Item types</b><br>
    818       <select name="items" size="15" onChange="itemsOnClick()" multiple>
     818      <select name="items" size="14" onChange="itemsOnClick()" multiple>
    819819      <%
    820820      Map<String, List<Item>> permissionGroups = PermissionUtil.getPermissionGroups();
  • trunk/www/admin/plugindefinitions/view_plugin.jsp

    r3871 r3890  
    353353      <%
    354354      ItemQuery<PluginConfiguration> configQuery = plugin.getPluginConfigurations();
    355       configQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     355      configQuery.include(Include.ALL);
    356356      configQuery.order(Orders.asc(Hql.property("name")));
    357357      ItemResultList<PluginConfiguration> configurations = configQuery.list(dc);
     
    398398            %>
    399399            <tbl:row>
    400               <tbl:cell column="name"><%=Base.getLinkedName(ID, pc, false, true)%></tbl:cell>
     400              <tbl:cell column="name"><base:icon
     401                  image="deleted.gif"
     402                  tooltip="This item has been scheduled for deletion"
     403                  visible="<%=pc.isRemoved()%>"
     404                /><%=Base.getLinkedName(ID, pc, false, true)%></tbl:cell>
    401405              <tbl:cell column="description"><%=HTML.encodeTags(pc.getDescription())%></tbl:cell>
    402406              <tbl:cell column="configure">
     
    425429      <%
    426430      ItemQuery<JobAgent> agentQuery = JobAgent.getQuery();
    427       agentQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     431      agentQuery.include(Include.ALL);
    428432      agentQuery.order(Orders.asc(Hql.property("name")));
    429433      agentQuery.join(Hql.innerJoin("plugins", "p"));
     
    493497            %>
    494498            <tbl:row>
    495               <tbl:cell column="name"><%=Base.getLinkedName(ID, agent, false, true)%></tbl:cell>
     499              <tbl:cell column="name"><base:icon
     500                  image="deleted.gif"
     501                  tooltip="This item has been scheduled for deletion"
     502                  visible="<%=agent.isRemoved()%>"
     503                /><%=Base.getLinkedName(ID, agent, false, true)%></tbl:cell>
    496504              <tbl:cell column="server"><%=server == null || port == null ? "" : server + ":" + port%></tbl:cell>
    497505              <tbl:cell column="info">
     
    565573              <tbl:row>
    566574                <tbl:cell column="itemType"><%=project.getType()%></tbl:cell>
    567                 <tbl:cell column="name"><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
     575                <tbl:cell column="name"><base:icon
     576                  image="deleted.gif"
     577                  tooltip="This item has been scheduled for deletion"
     578                  visible="<%=project.isRemoved()%>"
     579                /><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
    568580                <tbl:cell column="permissions">
    569581                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    579591              <tbl:row>             
    580592                <tbl:cell column="itemType"><%=group.getType()%></tbl:cell>
    581                 <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     593                <tbl:cell column="name"><base:icon
     594                  image="deleted.gif"
     595                  tooltip="This item has been scheduled for deletion"
     596                  visible="<%=group.isRemoved()%>"
     597                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    582598                <tbl:cell column="permissions">
    583599                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    593609              <tbl:row>             
    594610                <tbl:cell column="itemType"><%=user.getType()%></tbl:cell>
    595                 <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     611                <tbl:cell column="name"><base:icon
     612                  image="deleted.gif"
     613                  tooltip="This item has been scheduled for deletion"
     614                  visible="<%=user.isRemoved()%>"
     615                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    596616                <tbl:cell column="permissions">
    597617                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
  • trunk/www/admin/plugintypes/edit_plugintype.jsp

    r3679 r3890  
    136136          value="<%=HTML.encodeTags(pluginType == null ?
    137137            Values.getString(cc.getPropertyValue("name"), "New plugin type") : pluginType.getName())%>"
    138           size="40" maxlength="<%=PluginType.MAX_NAME_LENGTH%>"></td>
     138          size="60" maxlength="<%=PluginType.MAX_NAME_LENGTH%>"></td>
    139139      </tr>
    140140      <tr>
     
    142142        <td><input <%=requiredClazz%> type="text" name="interfaceName"
    143143          value="<%=HTML.encodeTags(pluginType == null ? cc.getPropertyValue("interfaceName") : pluginType.getInterfaceName())%>"
    144           size="40" maxlength="<%=PluginType.MAX_INTERFACENAME_LENGTH%>"></td>
     144          size="60" maxlength="<%=PluginType.MAX_INTERFACENAME_LENGTH%>"></td>
    145145      </tr>
    146146      <tr>
     
    148148        <td><input <%=clazz%> type="text" name="jarPath"
    149149          value="<%=HTML.encodeTags(pluginType == null ? cc.getPropertyValue("jarPath") : pluginType.getJarPath())%>"
    150           size="40" maxlength="<%=PluginType.MAX_JARPATH_LENGTH%>"></td>
     150          size="60" maxlength="<%=PluginType.MAX_JARPATH_LENGTH%>"></td>
    151151      </tr>
    152152      <tr valign=top>
    153153        <td class="prompt">Description</td>
    154154        <td nowrap>
    155           <textarea <%=clazz%> rows="4" cols="40" name="description" wrap="virtual"
     155          <textarea <%=clazz%> rows="4" cols="50" name="description" wrap="virtual"
    156156            ><%=HTML.encodeTags(pluginType == null ? cc.getPropertyValue("description") : pluginType.getDescription())%></textarea>
    157157          <a href="javascript:Main.zoom('Description', 'pluginType', 'description')"
  • trunk/www/admin/plugintypes/view_plugintype.jsp

    r3679 r3890  
    194194      <%
    195195      ItemQuery<PluginDefinition> pluginQuery = pluginType.getPlugins();
    196       pluginQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     196      pluginQuery.include(Include.ALL);
    197197      pluginQuery.order(Orders.asc(Hql.property("name")));
    198198      ItemResultList<PluginDefinition> plugins = pluginQuery.list(dc);
     
    235235            %>
    236236            <tbl:row>
    237               <tbl:cell column="name"><%=Base.getLinkedName(ID, new NameablePluginAdaptor(plugin), false, true)%></tbl:cell>
     237              <tbl:cell column="name"><base:icon
     238                  image="deleted.gif"
     239                  tooltip="This item has been scheduled for deletion"
     240                  visible="<%=plugin.isRemoved()%>"
     241                /><%=Base.getLinkedName(ID, new NameablePluginAdaptor(plugin), false, true)%></tbl:cell>
    238242              <tbl:cell column="class"><%=HTML.encodeTags(plugin.getClassName())%></tbl:cell>
    239243              <tbl:cell column="description"><%=HTML.encodeTags(plugin.getDescription())%></tbl:cell>
  • trunk/www/admin/protocols/edit_protocol.jsp

    r3679 r3890  
    116116  // Query to retrieve protocol types
    117117  final ItemQuery<ProtocolType> protocolTypeQuery = ProtocolType.getQuery();
     118  protocolTypeQuery.include(Include.ALL);
    118119  protocolTypeQuery.order(Orders.asc(Hql.property("name")));
    119120 
     
    196197        var annotationTypes = frm.annotationTypes;
    197198        <%
    198         parameterQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     199        parameterQuery.include(Include.ALL);
    199200        parameterQuery.order(Orders.asc(Hql.property("name")));
    200201        ItemResultList<AnnotationType> parameters = parameterQuery.list(dc);
     
    263264            {
    264265              int id = protocolType.getId();
     266              if (id != currentProtocolTypeId && protocolType.isRemoved()) continue;
    265267              %>
    266268              <option value="<%=id == currentProtocolTypeId && protocol != null ? -id : id%>"
  • trunk/www/admin/protocols/view_protocol.jsp

    r3679 r3890  
    237237      <%
    238238      ItemQuery<AnnotationType> parameterQuery = protocol.getParameters();
    239       parameterQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     239      parameterQuery.include(Include.ALL);
    240240      parameterQuery.order(Orders.asc(Hql.property("name")));
    241241      ItemResultList<AnnotationType> parameters = parameterQuery.list(dc);
     
    278278            %>
    279279            <tbl:row>
    280               <tbl:cell column="name"><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell>
     280              <tbl:cell column="name"><base:icon
     281                  image="deleted.gif"
     282                  tooltip="This item has been scheduled for deletion"
     283                  visible="<%=item.isRemoved()%>"
     284                /><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell>
    281285              <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
    282286              <tbl:cell column="values">
     
    334338              <tbl:row>
    335339                <tbl:cell column="itemType"><%=project.getType()%></tbl:cell>
    336                 <tbl:cell column="name"><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
     340                <tbl:cell column="name"><base:icon
     341                  image="deleted.gif"
     342                  tooltip="This item has been scheduled for deletion"
     343                  visible="<%=project.isRemoved()%>"
     344                /><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
    337345                <tbl:cell column="permissions">
    338346                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    348356              <tbl:row>             
    349357                <tbl:cell column="itemType"><%=group.getType()%></tbl:cell>
    350                 <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     358                <tbl:cell column="name"><base:icon
     359                  image="deleted.gif"
     360                  tooltip="This item has been scheduled for deletion"
     361                  visible="<%=group.isRemoved()%>"
     362                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    351363                <tbl:cell column="permissions">
    352364                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    362374              <tbl:row>             
    363375                <tbl:cell column="itemType"><%=user.getType()%></tbl:cell>
    364                 <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     376                <tbl:cell column="name"><base:icon
     377                  image="deleted.gif"
     378                  tooltip="This item has been scheduled for deletion"
     379                  visible="<%=user.isRemoved()%>"
     380                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    365381                <tbl:cell column="permissions">
    366382                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
  • trunk/www/admin/protocoltypes/view_protocoltype.jsp

    r3679 r3890  
    201201      <%
    202202      ItemQuery<Protocol> protocolQuery = protocolType.getProtocols();
    203       protocolQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     203      protocolQuery.include(Include.ALL);
    204204      protocolQuery.order(Orders.asc(Hql.property("name")));
    205205      ItemResultList<Protocol> protocols = protocolQuery.list(dc);
     
    242242            %>
    243243            <tbl:row>
    244               <tbl:cell column="name"><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell>
     244              <tbl:cell column="name"><base:icon
     245                  image="deleted.gif"
     246                  tooltip="This item has been scheduled for deletion"
     247                  visible="<%=item.isRemoved()%>"
     248                /><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell>
    245249              <tbl:cell column="file"><base:propertyvalue item="<%=item%>" property="file" /></tbl:cell>
    246250              <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
  • trunk/www/admin/roles/edit_role.jsp

    r3679 r3890  
    3434  import="net.sf.basedb.core.Item"
    3535  import="net.sf.basedb.core.ItemContext"
     36  import="net.sf.basedb.core.Include"
    3637  import="net.sf.basedb.core.Permission"
    3738  import="net.sf.basedb.core.User"
     
    146147  {
    147148    userQuery = role.getUsers();
     149    userQuery.include(Include.ALL);
    148150    userQuery.order(Orders.asc(Hql.property("name")));
    149151  }
     
    346348
    347349    <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    348     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*280)+"px;"%>"
     350    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*300)+"px;"%>"
    349351      position="bottom" remember="<%=role != null%>">
    350352    <t:tab id="info" title="Role" validate="validateRole()" helpid="role.edit">
  • trunk/www/admin/roles/view_role.jsp

    r3679 r3890  
    303303      <%
    304304      ItemQuery<User> userQuery = role.getUsers();
    305       userQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     305      userQuery.include(Include.ALL);
    306306      userQuery.order(Orders.asc(Hql.property("name")));
    307307      ItemResultList<User> users = userQuery.list(dc);
     
    344344            %>
    345345            <tbl:row>
    346               <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     346              <tbl:cell column="name"><base:icon
     347                  image="deleted.gif"
     348                  tooltip="This item has been scheduled for deletion"
     349                  visible="<%=user.isRemoved()%>"
     350                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    347351              <tbl:cell column="type">User</tbl:cell>
    348352              <tbl:cell column="description"><%=HTML.encodeTags(user.getDescription())%></tbl:cell>
  • trunk/www/admin/software/edit_software.jsp

    r3679 r3890  
    146146
    147147    <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    148     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*160)+"px;"%>"
     148    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*180)+"px;"%>"
    149149      position="bottom"  remember="<%=software != null%>">
    150150    <t:tab id="info" title="Software" validate="validateSoftware()" helpid="software.edit">
  • trunk/www/admin/software/view_software.jsp

    r3679 r3890  
    267267              <tbl:row>
    268268                <tbl:cell column="itemType"><%=project.getType()%></tbl:cell>
    269                 <tbl:cell column="name"><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
     269                <tbl:cell column="name"><base:icon
     270                  image="deleted.gif"
     271                  tooltip="This item has been scheduled for deletion"
     272                  visible="<%=project.isRemoved()%>"
     273                /><%=Base.getLinkedName(ID, project, false, true)%></tbl:cell>
    270274                <tbl:cell column="permissions">
    271275                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    281285              <tbl:row>             
    282286                <tbl:cell column="itemType"><%=group.getType()%></tbl:cell>
    283                 <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     287                <tbl:cell column="name"><base:icon
     288                  image="deleted.gif"
     289                  tooltip="This item has been scheduled for deletion"
     290                  visible="<%=group.isRemoved()%>"
     291                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    284292                <tbl:cell column="permissions">
    285293                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
     
    295303              <tbl:row>             
    296304                <tbl:cell column="itemType"><%=user.getType()%></tbl:cell>
    297                 <tbl:cell column="name"><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
     305                <tbl:cell column="name"><base:icon
     306                  image="deleted.gif"
     307                  tooltip="This item has been scheduled for deletion"
     308                  visible="<%=user.isRemoved()%>"
     309                /><%=Base.getLinkedName(ID, user, false, true)%></tbl:cell>
    298310                <tbl:cell column="permissions">
    299311                  <%=PermissionUtil.translatePermissionsToString(permissions)%>
  • trunk/www/admin/softwaretypes/view_softwaretype.jsp

    r3679 r3890  
    158158      <%
    159159      ItemQuery<Software> softwareQuery = softwareType.getSoftware();
    160       softwareQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     160      softwareQuery.include(Include.ALL);
    161161      softwareQuery.order(Orders.asc(Hql.property("name")));
    162162      ItemResultList<Software> software = softwareQuery.list(dc);
     
    199199            %>
    200200            <tbl:row>
    201               <tbl:cell column="name"><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell>
     201              <tbl:cell column="name"><base:icon
     202                  image="deleted.gif"
     203                  tooltip="This item has been scheduled for deletion"
     204                  visible="<%=item.isRemoved()%>"
     205                /><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell>
    202206              <tbl:cell column="version"><%=HTML.encodeTags(item.getVersionString())%></tbl:cell>
    203207              <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
  • trunk/www/admin/users/edit_default_membership.jsp

    r3675 r3890  
    7373  // Query to retrieve default groups
    7474  ItemQuery<Group> groupQuery = Group.getQuery();
     75  groupQuery.include(Include.ALL);
    7576  groupQuery.restrict(
    7677    Restrictions.eq(
     
    8384  // Query to retrieve default roles
    8485  ItemQuery<Role> roleQuery = Role.getQuery();
     86  roleQuery.include(Include.ALL);
    8587  roleQuery.restrict(
    8688    Restrictions.eq(
     
    202204      <td>
    203205        <b>Member in</b><br>
    204         <select name="membership" size="15" multiple <%=!writeMembership ? "disabled readonly class=\"disabled\"" : ""%> style="width: 15em;">
     206        <select name="membership" size="14" multiple <%=!writeMembership ? "disabled readonly class=\"disabled\"" : ""%> style="width: 15em;">
    205207        </select>
    206208        <input type="hidden" name="removeGroups" value="">
  • trunk/www/admin/users/edit_user.jsp

    r3679 r3890  
    150150
    151151    groupQuery = user.getGroups();
     152    groupQuery.include(Include.ALL);
    152153    groupQuery.order(Orders.asc(Hql.property("name")));
    153154    roleQuery = user.getRoles();
     155    roleQuery.include(Include.ALL);
    154156    roleQuery.order(Orders.asc(Hql.property("name")));
    155157  }
     
    171173  // Query to retrieve quota
    172174  final ItemQuery<Quota> quotaQuery = Quota.getQuery();
     175  quotaQuery.include(Include.ALL);
    173176  quotaQuery.order(Orders.asc(Hql.property("name")));
    174177  quotaQuery.setCacheResult(true);
     
    176179  // Query to retrieve quota groups
    177180  final ItemQuery<Group> quotaGroupQuery = Group.getQuery();
     181  quotaGroupQuery.include(Include.ALL);
    178182  quotaGroupQuery.order(Orders.asc(Hql.property("name")));
    179183  quotaGroupQuery.restrict(Restrictions.neq(Hql.property("quota"), null));
     
    182186  // Query to retrieve home directories
    183187  final ItemQuery<Directory> directoryQuery = Directory.getQuery();
    184   directoryQuery.include(Include.MINE, Include.OTHERS);
     188  directoryQuery.include(Include.ALL);
    185189  directoryQuery.order(Orders.asc(Hql.property("name")));
    186190  directoryQuery.restrict(
     
    407411
    408412    <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    409     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*280)+"px;"%>"
     413    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*300)+"px;"%>"
    410414      position="bottom" remember="<%=user != null%>">
    411415    <t:tab id="info" title="User" validate="validateUser()" helpid="user.edit">
     
    453457          {
    454458            boolean current = quota.equals(currentQuota);
     459            if (!current && quota.isRemoved()) continue;
    455460            int id = quota.getId();
    456461            long totalBytes = quota.getQuotaValue(total, Location.PRIMARY);
     
    486491            {
    487492              boolean current = quotaGroup.equals(currentQuotaGroup);
     493              if (!current && quotaGroup.isRemoved()) continue;
    488494              int id = quotaGroup.getId();
    489495              Quota quota = quotaGroup.getQuota();
     
    529535              int id = d.getId();
    530536              boolean current = d.equals(homeDirectory);
     537              if (!current && d.isRemoved()) continue;
    531538              %>
    532539              <option
  • trunk/www/admin/users/index.jsp

    r3679 r3890  
    156156    {
    157157      user = User.getNew(dc, login, password);
     158      user.addToDefaultRolesAndGroups();
    158159      message = "User created";
    159160      dc.saveItem(user);
     
    228229
    229230    // Membership
    230     user.addToDefaultRolesAndGroups();
    231231    String[] removeGroups = Values.getString(request.getParameter("removeGroups")).split(",");
    232232    for (int i = 0; i < removeGroups.length; ++i)
  • trunk/www/admin/users/view_user.jsp

    r3679 r3890  
    286286
    287287      ItemQuery<Group> groupQuery = user.getGroups();
    288       groupQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     288      groupQuery.include(Include.ALL);
    289289      groupQuery.order(Orders.asc(Hql.property("name")));
    290290      ItemResultList<Group> groups = groupQuery.list(dc);
    291291     
    292292      ItemQuery<Role> roleQuery = user.getRoles();
    293       roleQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
     293      roleQuery.include(Include.ALL);
    294294      roleQuery.order(Orders.asc(Hql.property("name")));
    295295      ItemResultList<Role> roles = roleQuery.list(dc);
     
    332332            %>
    333333            <tbl:row>
    334               <tbl:cell column="name"><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
     334              <tbl:cell column="name"><base:icon
     335                  image="deleted.gif"
     336                  tooltip="This item has been scheduled for deletion"
     337                  visible="<%=group.isRemoved()%>"
     338                /><%=Base.getLinkedName(ID, group, false, true)%></tbl:cell>
    335339              <tbl:cell column="type">Group</tbl:cell>
    336340              <tbl:cell column="description"><%=HTML.encodeTags(group.getDescription())%></tbl:cell>
     
    342346            %>
    343347            <tbl:row>
    344               <tbl:cell column="name"><%=Base.getLinkedName(ID, role, false, true)%></tbl:cell>
     348              <tbl:cell column="name"><base:icon
     349                  image="deleted.gif"
     350                  tooltip="This item has been scheduled for deletion"
     351                  visible="<%=role.isRemoved()%>"
     352                /><%=Base.getLinkedName(ID, role, false, true)%></tbl:cell>
    345353              <tbl:cell column="type">Role</tbl:cell>
    346354              <tbl:cell column="description"><%=HTML.encodeTags(role.getDescription())%></tbl:cell>
  • trunk/www/include/scripts/main.js

    r3871 r3890  
    411411    this.controllers['PLATETYPE'] = { url:'lims/platetypes/index.jsp', width:500, height:340 };
    412412    this.controllers['PLATEEVENTTYPE'] = { url:'lims/platetypes/eventtypes/index.jsp', width:500, height:340 };
    413     this.controllers['ANNOTATIONTYPE'] = { url:'admin/annotationtypes/index.jsp', width:540, height:400 };
     413    this.controllers['ANNOTATIONTYPE'] = { url:'admin/annotationtypes/index.jsp', width:540, height:420 };
    414414    this.controllers['ANNOTATIONTYPECATEGORY'] = { url:'admin/annotationtypecategories/index.jsp', width:540, height:400 };
    415415    this.controllers['CLIENT'] = { url:'admin/clients/index.jsp', width:500, height:340 };
     
    435435    this.controllers['USER'] = { url:'admin/users/index.jsp', width:600, height:440 };
    436436    this.controllers['ANYTOANY'] = { url:'common/anytoany/index.jsp', width:500, height:340, popup:true };
    437     this.controllers['EXTRAVALUETYPE'] = { url:'admin/extravaluetypes/index.jsp', width:500, height:360 };
     437    this.controllers['EXTRAVALUETYPE'] = { url:'admin/extravaluetypes/index.jsp', width:500, height:400 };
    438438    this.controllers['EXTRAVALUE'] = { url:'views/experiments/extravalues/index.jsp', width:500, height:340, edit:false };
    439439    this.controllers['PLATFORM'] = { url:'admin/platforms/index.jsp', width:540, height:400 };
Note: See TracChangeset for help on using the changeset viewer.