Changeset 4588

Timestamp:

Oct 16, 2008, 12:13:47 PM (14 years ago)

Author:

Martin Svensson

Message:

Fixes #1136 Give away/set owner of items

Location:

trunk

Files:

• doc/src/docbook/admindoc/user_administration.xml (modified) (1 diff)
• doc/src/docbook/figures/plugin_permissions.png (modified) (previous)
• doc/src/docbook/figures/project_members.png (modified) (previous)
• doc/src/docbook/figures/select_owner.png (modified) (previous)
• doc/src/docbook/figures/set_permissions.png (modified) (previous)
• doc/src/docbook/userdoc/webclient.xml (modified) (3 diffs)
• www/views/items/index.jsp (modified) (2 diffs)
• www/views/items/list_items.jsp (modified) (2 diffs)

trunk/doc/src/docbook/admindoc/user_administration.xml

@@ -953 +953 @@
               <simpara>
                 <guilabel>O</guilabel>
-                = Change owner
+                = Set owner
               </simpara>
             </listitem>

trunk/doc/src/docbook/userdoc/webclient.xml

@@ -1206 +1206 @@
                 <listitem><simpara><guilabel>W</guilabel> = Write</simpara></listitem>
                 <listitem><simpara><guilabel>D</guilabel> = Delete</simpara></listitem>
-                <listitem><simpara><guilabel>O</guilabel> = Change owner</simpara></listitem>
+                <listitem><simpara><guilabel>O</guilabel> = Set owner</simpara></listitem>
                 <listitem><simpara><guilabel>P</guilabel> = Set permission</simpara></listitem>
                 </itemizedlist>
@@ -1332 +1332 @@
         <title>Change owner of items</title>
         <para>
-          Sometime it may be necessary to change the owner of an item.
-          This can be done by everyone with <synopsis>Change owner</synopsis>
+          Sometimes it may be necessary to change the owner of an item.
+          This can be done by everyone with <emphasis>Set owner</emphasis>
           permission on the item.
           For a user to have the rights to change owner of an item, the item must 
-          either be owned by or shared with <guilabel>Change owner</guilabel> 
+          either be owned by or shared with <emphasis>Set owner</emphasis> 
           permission to the user . 
           See <xref linkend="webclient.items.share" />.
@@ -1342 +1342 @@
         
         <para>
-          An user with <synopsis>change owner</synopsis> permission can go to a list view 
+          An user with <emphasis>Set owner</emphasis> permission can go to a list view 
           (or the single-item view), mark the checkboxes for the items to change owner of, 
-          and click on the <guibutton>Set owner</guibutton> button. 
-          A dialog appears where the new owner can be selected. By default the logged in 
-          user is selected in the drop-down list but another user can be choosen with the 
-          <guibutton>Select</guibutton> button.
-        </para>
+          and click on the <guibutton>Set owner</guibutton> button.  
+          A dialog window, like the screen-shot below, will appear.
+        </para>
+        <helptext external_id="ownership.configure" title="Change owner">
+        <variablelist>
+        <varlistentry>
+          <term><guilabel>New owner</guilabel></term>
+          <listitem>
+          <para>
+            The user to be the new owner of selected item(s).
+            By default the current user will be selected but other
+            users can be picked from the <emphasis>currently used</emphasis> part of the drop-down 
+            list or by clicking on <guibutton>Select</guibutton>.
+          </para>
+          </listitem>
+        </varlistentry>
+        </variablelist>
+        <para>
+          Use the &gbSave; button to set the new owner
+          or the &gbCancel; button to
+          close the pop-up without saving.
+        </para>
+        </helptext> 
         <figure id="webclient.figures.selectowner">
           <title>Select a new owner</title>

trunk/www/views/items/index.jsp

@@ -30 +30 @@
   import="net.sf.basedb.core.BasicItem"
   import="net.sf.basedb.core.SharedItem"
+  import="net.sf.basedb.core.OwnedItem"
   import="net.sf.basedb.core.Removable"
   import="net.sf.basedb.core.Permission"
@@ -216 +217 @@
     redirect = "../../common/share/share.jsp?ID="+ID+"&item_type="+itemType.name()+"&subcontext="+subContext;
   }
-
+  else if ("SetOwnerOfItems".equals(cmd))
+  {
+    // Change owner of items selected on a list page
+    dc = sc.newDbControl();
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    Set<OwnedItem> items = new HashSet<OwnedItem>();
+    Enumeration<String> names = (Enumeration<String>)request.getParameterNames();
+    //User user = User.getById(dc, sc.getLoggedInUserId());
+    while (names.hasMoreElements())
+    {
+      String name = names.nextElement();
+      if (name.startsWith("item:"))
+      {
+        Item itemType = Item.valueOf(name.substring(5));
+        Integer[] ids = Values.getInt(request.getParameterValues(name));
+        for (int itemId : ids)
+        {
+          BasicItem item = itemType.getById(dc, itemId);
+          if (item instanceof OwnedItem && item.hasPermission(Permission.SET_OWNER))
+          {
+            items.add((OwnedItem)item);
+          }
+        }
+      }
+    }
+    dc.close();
+    cc.setObject("OwnedItems", items);
+    redirect = "../../common/ownership/ownership.jsp?ID="+ID+"&item_type="+itemType.name();
+  }
   else
   {

trunk/www/views/items/list_items.jsp

@@ -155 +155 @@
       Table.shareItems(submitPage, '<%=ID%>', formId, '<%=itemType.name()%>', 'ShareItems', /item:/);
     }
+    function setOwner()
+    {
+      Table.setOwnerOfItems(submitPage, '<%=ID%>', formId, '<%=itemType.name()%>', 'SetOwnerOfItems', /item:/);
+    }
     function configureColumns()
     {
@@ -237 +241 @@
           tooltip="Share the selected items"
           disabled="<%=totalCount <= 0%>"
+        />
+        <tbl:button 
+          image="take_ownership.png"
+          onclick="setOwner()" 
+          title="Set owner&hellip;"
+          tooltip="Change owner of the selected items"
         />
         <tbl:button