Ticket #2421: webPermissions.patch

modules/org.sophie2.server.webui/src/main/resources/org/sophie2/server/webui/content/main.css

@@ -101 +101 @@
         border: 1px outset #CCCCCC;
         color: #222222;
         padding: 0.1em 0.5em;
-        clear:left;
         float:left;
 }
 

modules/org.sophie2.s2s/src/main/java/org/sophie2/s2s/ServerModule.java

@@ -44 +44 @@
                                                 ServerResourceHelper helper = ServerCoreModule.get().getResourceHelperExtension(
                                                                 ).getObject();
                                                 helper.initialize();
-                                                WebAppModule.get().startServer(8888);
+                                                WebAppModule.get().startServer(9016);
                                         }
                                 });
 

modules/org.sophie2.main.func.servers/src/main/java/org/sophie2/main/func/servers/logic/ServersTabLogic.java

@@ -14 +14 @@
 import org.sophie2.base.connectivity.TransferManager;
 import org.sophie2.base.connectivity.TransferManager.TransferManagerCache;
 import org.sophie2.base.connectivity.resources.ResourceDirectoryH;
-import org.sophie2.base.connectivity.resources.ResourceDirectoryR4;
 import org.sophie2.base.connectivity.resources.ServerAccessOptions;
 import org.sophie2.base.connectivity.resources.binary.FacadeBinData;
 import org.sophie2.base.connectivity.resources.binary.FacadeBinDataUtil;
@@ -444 +443 @@
                         final ResourceRefR4 resourceRef = 
                                 ResourceRefR4.makeChild(output.getResourcePath());
 
-                        StoredResourceAccess directoryAccess = (StoredResourceAccess) serverResourcesDirectory.getAccess();
-                        if (ResourceDirectoryR4.KEY_RESOURCES.get(directoryAccess).contains(resourceRef)) {
+                        if (serverResourcesDirectory.getResources().contains(resourceRef)) {
                                 DialogUtils.showErrorDialog(bookDocView.swingComponent().get(),
                                                 "There is already a resource at "+ resourceRef, "Could not upload resource");
                                 return false;
@@ -455 +453 @@
                         AccountH account = output.getAccount();
                         ServerConnection connection = accountsConnections.get(account);
 
+                        StoredResourceAccess directoryAccess = (StoredResourceAccess) serverResourcesDirectory.getAccess();
                         ResourceRefR4 absUserRef = directoryAccess.getAccessOptions().getUser();
-                        final ResourceRefR4 userRef = UserH.getRelRefFromUsers(absUserRef);
-                        final SecurityPermission othersPermissions = output.getPermissionLevel();
-                        final ResourceRefR4 defGroupRef = UserGroupR4.DEF_GROUP_REF;
-
-                        new AutoAction(Message.create("Setting up the access permissions"), true) {
-
-                                @Override
-                                public void performAuto() {
-                                        //Start at empty map every time you upload a book
-                                        ImmMap<ResourceRefR4, SecurityPermission> permissions = 
-                                                ImmTreeMap.<ResourceRefR4, SecurityPermission>empty()
-                                                .put(userRef, SecurityPermission.WRITE);
-                                        if (SecurityPermission.NONE != othersPermissions) {
-                                                permissions = permissions.put(defGroupRef, othersPermissions);
-                                        }
-                                        getChanger().setRaw(ResourceR4.KEY_SECURITY, permissions);
-                                }
-
-                        }.register(bookAccess);
-
-                        ResourceModel bookModel = bookAccess.getHead().getModel();
-                        ResourceRefR4 absoluteRef = serverResourcesDirectory.getRef().sub(resourceRef);
-                        String sessionId = connection.sessionId().get();
-                        final ResourceModel serverBookModel = FacadeBinDataUtil.convertBinDatasToFacade(
-                                        connection.getFacade(), absoluteRef, sessionId, bookModel, true);
-                        serverBookModel.debugPrint();
-
-                        final ResourceRefList curResources = 
-                                serverResourcesDirectory.getResources();
-
-                        new AutoAction(Message.create(UPLOAD_RES_TO_SERVER, resourceRef, 
-                                        serverResourcesDirectory.getRef()), true) {
-                                @Override
-                                public void performAuto() {
-                                        ResourceChanger dirChanger = getChanger();
-                                        ResourceDirectoryH.addResource(dirChanger, resourceRef,
-                                                        serverBookModel, curResources);
-                                }
+                        ResourceRefR4 userRef = UserH.getRelRefFromUsers(absUserRef);
+                        SecurityPermission othersPermissions = output.getPermissionLevel();
 
-                        }.register(directoryAccess);
+                        ResourceRefR4 absoluteRef = uploadToDirectory(serverResourcesDirectory, resourceRef, bookAccess, 
+                                                                                                                                        connection, userRef, othersPermissions);
 
-                        RevisionId lastRevId = directoryAccess.getHead().getId();
                         // XXX: may be sync must be in open of server locator.
+                        RevisionId lastRevId = directoryAccess.getHead().getId();
                         directoryAccess.syncToRemoteMaster();
                         RevisionId curRevId = directoryAccess.getHead().getId();
                         if (lastRevId != curRevId) {
@@ -506 +470 @@
                                 manager.startUpload(absoluteRef);
                         }
 
-                                AppMainWindow mainWindow = AppViewUtil.findMainWindow(bookDocView);
-
+                        //Close current doc view and if needed open from server.
+                        AppMainWindow mainWindow = AppViewUtil.findMainWindow(bookDocView);
                         if (output.isStartEditingOnServer()) {
                                 ResourceLocator locator = mainWindow.locator().get();
                                 AccessOptions options = bookAccess.getAccessOptions().modifyUser(userRef);
-                                AccessOptions serverOptions = new ServerAccessOptions(options, sessionId);
+                                AccessOptions serverOptions = new ServerAccessOptions(options, connection.sessionId().get());
                                 StoredResourceAccess serverAccess = 
                                         (StoredResourceAccess) locator.open(absoluteRef, serverOptions);
 
@@ -520 +484 @@
                                 mainWindow.documents().get().remove(bookDocView);
                                 mainWindow.currentDocument().set(null);
                         }
+                        
+                        //close the old access
                         bookAccess.close();
 
+                        //update resources palette (to add the new resource)
                         ServerResourcesPalette resourcesPalette = 
                                 connectionsPalette.findNearestElement(null, ServerResourcesPalette.class);
-
-                        updateResources(resourcesPalette, connectionsPalette, connection.account().get());
+                        updateResources(resourcesPalette, connectionsPalette, account);
 
                         return true;
                 }
-
         };
 
         /**
@@ -588 +553 @@
 
                 assert mainWindow != null : "There is no main window??";
                 ServerAccessOptions options = new ServerAccessOptions(
-                                AccessOptions.DEFAULT_ACCESS_OPTIONS, cacheKey.getSessionId());
+                                AccessOptions.DEFAULT_ACCESS_OPTIONS.modifyViewId(), cacheKey.getSessionId());
                 ResourceRefR4 bookref = cacheKey.getRef();
                 ResourceAccess bookAccess = mainWindow.locator().get().open(bookref, options);
 
@@ -695 +660 @@
                 return null;
         }
 
+        /**
+         * Helper method that adds changes security properties of a book and adds it 
+         * to a given server directory.  
+         * 
+         * @param serverResourcesDirectory
+         *                      The main server directory for resources. 
+         * @param resourceRef
+         *                      The ref of the new resource in the directory.
+         * @param bookAccess
+         *                      The access of the book to upload.
+         * @param connection
+         *                      The connection to the server to upload by.      
+         * @param userRef
+         *                      The user that uploads the book.
+         * @param othersPermission
+         *                      The permission level of the default group of users. 
+         * @return
+         *                      Absolute {@link ResourceRefR4}  
+         */
+        public static ResourceRefR4 uploadToDirectory(
+                        ResourceDirectoryH serverResourcesDirectory, final ResourceRefR4 resourceRef,
+                        ResourceAccess bookAccess, ServerConnection connection, 
+                        final ResourceRefR4 userRef, final SecurityPermission othersPermission) {
+                ResourceAccess directoryAccess = serverResourcesDirectory.getAccess();
+                
+                new AutoAction(Message.create("Setting up the access permissions"), true) {
+
+                        @Override
+                        public void performAuto() {
+                                //Start at empty map every time you upload a book
+                                ImmMap<ResourceRefR4, SecurityPermission> permissions = 
+                                        ImmTreeMap.<ResourceRefR4, SecurityPermission>empty()
+                                        .put(userRef, SecurityPermission.WRITE);
+                                if (SecurityPermission.NONE != othersPermission) {
+                                        permissions = permissions.put(UserGroupR4.DEF_GROUP_REF, othersPermission);
+                                }
+                                getChanger().setRaw(ResourceR4.KEY_SECURITY, permissions);
+                        }
+
+                }.register(bookAccess);
+
+                ResourceModel bookModel = bookAccess.getHead().getModel();
+                ResourceRefR4 absoluteRef = serverResourcesDirectory.getRef().sub(resourceRef);
+                String sessionId = connection.sessionId().get();
+                final ResourceModel serverBookModel = FacadeBinDataUtil.convertBinDatasToFacade(
+                                connection.getFacade(), absoluteRef, sessionId, bookModel, true);
+                serverBookModel.debugPrint();
+
+                final ResourceRefList curResources = serverResourcesDirectory.getResources();
+
+                new AutoAction(Message.create(UPLOAD_RES_TO_SERVER, resourceRef, 
+                                serverResourcesDirectory.getRef()), true) {
+                        @Override
+                        public void performAuto() {
+                                ResourceChanger dirChanger = getChanger();
+                                ResourceDirectoryH.addResource(dirChanger, resourceRef,
+                                                serverBookModel, curResources);
+                        }
+
+                }.register(directoryAccess);
+                
+                return absoluteRef;
+        }
 }
 

modules/org.sophie2.server.webui/src/main/resources/jsps/resource_directory.jspx

@@ -25 +25 @@
                 <form id="upload" action="${request.contextPath}/upload_resource"
                  enctype="multipart/form-data"
                  method="post">
-                        <input type="file" name="resourceFile"/>
-                        <input type="submit" value="Upload" />
+                        <div class="formContainer">
+                                <input type="file" name="resourceFile"/>
+                                <input type="submit" value="Upload" />
+                                <input type="radio" name="permission" value="noRights" checked="checked">No rights</input>
+                                <input type="radio" name="permission" value="readRights">Read rights</input>
+                                <input type="radio" name="permission" value="writeRights">Read and Write rights</input>
+                        </div>
                 </form>
         </s2w:template>
 </jsp:root>
+ No newline at end of file