Changeset 5793


Ignore:
Timestamp:
Oct 7, 2011, 2:51:10 PM (10 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/filemanager/files/index.jsp

    r5643 r5793  
    151151    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, subcontext, pageContext, defaultContext);
    152152    cc.setId(0);
    153     redirect = editPage;
     153    redirect = editPage+"&directory_id="+directoryId;
    154154  }
    155155  else if ("UploadNewFile".equals(cmd))
  • trunk/www/filemanager/files/list_files.jsp

    r5713 r5793  
    248248    function editFile(fileId)
    249249    {
    250       Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', fileId, true);
     250      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', fileId, true, '&directory_id=<%=directoryId%>');
    251251    }
    252252    function uploadFile(fileId)
     
    752752        />
    753753        <tbl:button
     754          image="move.gif"
     755          onclick="Menu.toggleTopMenu(document.getElementById('move'), event.clientX, event.clientY); event.cancelBubble = true;"
     756          title="Move&hellip;"
     757          tooltip="Move the selected items"
     758          visible="<%=mode.hasToolbar()%>"
     759        />
     760      </tbl:toolbar>
     761      <tbl:toolbar
     762        visible="true"
     763        >
     764        <tbl:button
    754765          image="delete.gif"
    755766          onclick="deleteItems()"
     
    763774          title="Restore"
    764775          tooltip="Restore the selected (deleted) items"
    765           visible="<%=mode.hasToolbar()%>"
    766         />
    767         <tbl:button
    768           image="move.gif"
    769           onclick="Menu.toggleTopMenu(document.getElementById('move'), event.clientX, event.clientY); event.cancelBubble = true;"
    770           title="Move&hellip;"
    771           tooltip="Move the selected items"
    772776          visible="<%=mode.hasToolbar()%>"
    773777        />
  • trunk/www/filemanager/index.jsp

    r5713 r5793  
    8787  else if ("NewItem".equals(cmd))
    8888  {
    89     redirect = "files/index.jsp?ID="+ID+"&cmd=NewItem";
     89    redirect = "files/index.jsp?ID="+ID+"&cmd=NewItem&directory_id="+request.getParameter("directory_id");
    9090  }
    9191  else if ("EditItem".equals(cmd))
Note: See TracChangeset for help on using the changeset viewer.