Changeset 7575 for trunk

Timestamp:

Jan 9, 2019, 2:07:49 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2135: Remove support for secondary storage

Removed code related to the 'action' property of files.

Location:

trunk/www/filemanager/files

Files:

• files.js (modified) (1 diff)
• index.jsp (modified) (2 diffs)
• list_files.jsp (modified) (3 diffs)
• view_file.jsp (modified) (3 diffs)

trunk/www/filemanager/files/files.js

@@ -107 +107 @@
       Events.addEventHandler('mnuMoveToDirectory', 'base-selected', fileManager.moveToDirectory);
       Events.addEventHandler('mnuMoveOffline', 'click', fileManager.moveToLocation);
-      Events.addEventHandler('mnuMoveToPrimary', 'click', fileManager.moveToLocation);
-      Events.addEventHandler('mnuMoveToSecondary', 'click', fileManager.moveToLocation);
       
       Events.addEventHandler('reloadOnNotify', 'base-notify', App.reloadWindow);

trunk/www/filemanager/files/index.jsp

@@ -488 +488 @@
           // 0 = move offline
           f.setLocation(Location.OFFLINE);
-          f.setAction(File.Action.NOTHING);
-          numMoved++;
-        }
-        else if (moveTo == Location.PRIMARY)
-        {
-          // 1 = move to primary
-          f.setAction(current == Location.PRIMARY ? File.Action.NOTHING : File.Action.MOVE_TO_PRIMARY);
-          numMoved++;
-        }
-        else if (moveTo == Location.SECONDARY)
-        {
-          // 2 = move to secondary
-          f.setAction(current == Location.SECONDARY ? File.Action.NOTHING : File.Action.MOVE_TO_SECONDARY);
           numMoved++;
         }
@@ -526 +513 @@
       // 0 = move offline
       f.setLocation(Location.OFFLINE);
-      f.setAction(File.Action.NOTHING);
-    }
-    else if (moveTo == Location.PRIMARY)
-    {
-      // 1 = move to primary
-      f.setAction(current == Location.PRIMARY ? File.Action.NOTHING : File.Action.MOVE_TO_PRIMARY);
-    }
-    else if (moveTo == Location.SECONDARY)
-    {
-      // 2 = move to secondary
-      f.setAction(current == Location.SECONDARY ? File.Action.NOTHING : File.Action.MOVE_TO_SECONDARY);
     }
     dc.commit();

trunk/www/filemanager/files/list_files.jsp

@@ -274 +274 @@
       tooltip="Remove the selected files from the server (immedately)"
     />
-    <%
-    if (Application.hasSecondaryStorage())
-    {
-      %>
-      <m:menuitem 
-        id="mnuMoveToPrimary"
-        data-location="PRIMARY"
-        title="To primary location" 
-        tooltip="Enqueue the selected files to be moved back to primary storage"
-      />
-      <m:menuitem 
-        id="mnuMoveToSecondary"
-        data-location="SECONDARY"
-        title="To secondary location" 
-        tooltip="Enqueue the selected files to be moved to secondary storage"
-      />
-      <%
-    }
-    %>
     
   </m:menu>
@@ -465 +446 @@
         enumeration="<%=locations%>"
         title="Location"
-        sortable="true" 
-        filterable="true"
-        exportable="true"
-      />
-      <%
-      Enumeration<String, String> actions = new Enumeration<String, String>();
-      for (File.Action a : File.Action.values())
-      {
-        actions.add(Integer.toString(a.getValue()), a.toString());
-      }
-      %>
-      <tbl:columndef 
-        id="action"
-        property="action"
-        datatype="int"
-        enumeration="<%=actions%>"
-        title="Action"
         sortable="true" 
         filterable="true"
@@ -1000 +964 @@
                 <tbl:cell column="characterSet"><%=HTML.encodeTags(item.getCharacterSet())%></tbl:cell>
                 <tbl:cell column="location"><%=item.getLocation()%></tbl:cell>
-                <tbl:cell column="action"><%=item.getAction()%></tbl:cell>
                 <tbl:cell column="md5"><%=HTML.encodeTags(item.getMd5())%></tbl:cell>
                 <tbl:cell column="owner"

trunk/www/filemanager/files/view_file.jsp

@@ -251 +251 @@
         <td><%=file.isWriteProtected() ? "yes" : "no"%></td>
       </tr>
-      <%
-      File.Action action = file.getAction();
-      %>
       <tr>
         <th>Location</th>
-        <td><%=location%>
-        <%
-        if (action == File.Action.MOVE_TO_PRIMARY)
-        {
-          %>
-          (Wating for move to primary)
-          <%
-        }
-        else if (action == File.Action.MOVE_TO_SECONDARY)
-        {
-          %>
-          (Wating for move to secondary)
-          <%
-        }
-        %>
+        <td><%=location%>       
         <%
         if (location.isDownloadable())
@@ -296 +279 @@
               data-location="OFFLINE"
               >move offline</span>
-            <%
-            if (action == File.Action.MOVE_TO_SECONDARY)
-            {
-              %>
-              | <a href="index.jsp?ID=<%=ID%>&cmd=MoveItem&move=1&item_id=<%=itemId%>">cancel move to secondary
-              <%
-            }
-            else if (Application.hasSecondaryStorage())
-            {
-              %>
-              | <a href="index.jsp?ID=<%=ID%>&cmd=MoveItem&move=2&item_id=<%=itemId%>">move to secondary</a>
-              <%
-            }
-            %>
             | <span class="link auto-init"
               data-auto-init="upload-file"
@@ -318 +287 @@
           ]
           <%
-        }
-        else if (location == Location.SECONDARY)
-        {
-          %>
-          [<span class="link" 
-              id="moveOffline"
-              data-file-id="<%=itemId %>"
-              data-location="OFFLINE"
-              >move offline</span>
-          <%
-          if (action == File.Action.MOVE_TO_PRIMARY)
-          {
-            %>
-            | <a href="index.jsp?ID=<%=ID%>&cmd=MoveItem&move=2&item_id=<%=itemId%>">cancel move to primary
-            <%
-          }
-          else
-          {
-            %>
-            | <a href="index.jsp?ID=<%=ID%>&cmd=MoveItem&move=1&item_id=<%=itemId%>">move to primary</a>
-            <%
-          }
-          %>
-          ]
-          <%
-        }
+        }       
         else if (location == Location.OFFLINE)
         {