Changeset 3550

Timestamp:

Jul 5, 2007, 1:18:28 PM (16 years ago)

Author:

Martin Svensson

Message:

Fixes #611 Improvements of Trashcan. Changed confusing button text/icon.
Browser is now redirected to an item's view page when the item has been restored from trashcan->view_item.jsp

Location:

trunk/www/views/trashcan

Files:

• index.jsp (modified) (1 diff)
• view_item.jsp (modified) (2 diffs)

trunk/www/views/trashcan/index.jsp

@@ -219 +219 @@
     Item itemType = Item.valueOf(request.getParameter("item_type"));
     int itemId = Values.getInt(request.getParameter("item_id"));
+    String itemsIndexPage = request.getParameter("itemsIndexPage");
     BasicItem item = itemType.getById(dc, itemId);
     Removable r = (Removable)item;
     r.setRemoved(false);
     dc.commit();
-    redirect = viewPage + "&item_type=" + itemType.name() + "&item_id="+itemId;
+    redirect = itemsIndexPage + "?ID=" + ID + "&cmd=ViewItem&item_id=" + itemId;
   }
   else if ("DeleteItem".equals(cmd))

trunk/www/views/trashcan/view_item.jsp

@@ -128 +128 @@
     function restoreItem()
     {
-      url = 'index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_type=<%=itemType.name()%>&item_id=<%=itemId%>';
+      var controller = Main.getController('<%=itemType.name()%>');
+      url = 'index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_type=<%=itemType.name()%>&item_id=<%=itemId%>';      
+      url += '&itemsIndexPage=' + getRoot() + controller.url;
       location.replace(url);
     }
@@ -195 +197 @@
       <tbl:button 
         disabled="<%=deletePermission ? false : true%>" 
-        image="<%=deletePermission ? "delete.gif" : "delete_disabled.gif"%>" 
+        image="<%=deletePermission ? "delete_permanently.png" : "delete_permanently_disabled.png"%>" 
         onclick="deleteItem()" 
-        title="Delete"
+        title="Delete permanently&hellip;"
         visible="<%=!isUsed%>"
         tooltip="<%=deletePermission ? "Permanently delete this item" : "You do not have permission to delete this item"%>"