Changeset 5793

Timestamp:

Oct 7, 2011, 2:51:10 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1634: All external files are created in the root directory

Also divided the toolbar into two since it is really wide.

Location:

trunk/www/filemanager

Files:

• files/index.jsp (modified) (1 diff)
• files/list_files.jsp (modified) (3 diffs)
• index.jsp (modified) (1 diff)

trunk/www/filemanager/files/index.jsp

@@ -151 +151 @@
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, subcontext, pageContext, defaultContext);
     cc.setId(0);
-    redirect = editPage;
+    redirect = editPage+"&directory_id="+directoryId;
   }
   else if ("UploadNewFile".equals(cmd))

trunk/www/filemanager/files/list_files.jsp

@@ -248 +248 @@
     function editFile(fileId)
     {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', fileId, true);
+      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', fileId, true, '&directory_id=<%=directoryId%>');
     }
     function uploadFile(fileId)
@@ -752 +752 @@
         />
         <tbl:button 
+          image="move.gif"
+          onclick="Menu.toggleTopMenu(document.getElementById('move'), event.clientX, event.clientY); event.cancelBubble = true;" 
+          title="Move&hellip;" 
+          tooltip="Move the selected items"
+          visible="<%=mode.hasToolbar()%>"
+        />
+      </tbl:toolbar>
+      <tbl:toolbar
+        visible="true" 
+        >
+        <tbl:button 
           image="delete.gif"
           onclick="deleteItems()" 
@@ -763 +774 @@
           title="Restore" 
           tooltip="Restore the selected (deleted) items"
-          visible="<%=mode.hasToolbar()%>"
-        />
-        <tbl:button 
-          image="move.gif"
-          onclick="Menu.toggleTopMenu(document.getElementById('move'), event.clientX, event.clientY); event.cancelBubble = true;" 
-          title="Move&hellip;" 
-          tooltip="Move the selected items"
           visible="<%=mode.hasToolbar()%>"
         />

trunk/www/filemanager/index.jsp

@@ -87 +87 @@
   else if ("NewItem".equals(cmd))
   {
-    redirect = "files/index.jsp?ID="+ID+"&cmd=NewItem";
+    redirect = "files/index.jsp?ID="+ID+"&cmd=NewItem&directory_id="+request.getParameter("directory_id");
   }
   else if ("EditItem".equals(cmd))