Changeset 5540

Timestamp:

08/08/14 08:26:55 (10 years ago)

Author:

Twan Goosen

Message:

Enabled 'edit' option with confirmation dialogue for published collections (works for private collections and owner) and allowed access to edit view for non-private
Refs #600

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry

Files:

• gui/Application.properties (modified) (1 diff)
• gui/pages/BrowseEditableCollectionsPanel.html (modified) (1 diff)
• gui/pages/BrowseEditableCollectionsPanel.java (modified) (4 diffs)
• gui/pages/EditVirtualCollectionPage.java (modified) (1 diff)
• model/User.java (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.properties

@@ -20 +20 @@
 collections.deleteconfirm: Do you really want to delete "${name}"?\nThis \
   operation is permanent and cannot be undone.
+collections.editpublishedconfirm: Do you really want to edit the PUBLISHED \
+collection "${name}"?\n\
+  Any changes will be made public immediately after editing and cannot be \
+  undone. Be aware that other users may not expect a published collection to \
+  change!

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowseEditableCollectionsPanel.html

@@ -9 +9 @@
   <div style="display: none" wicket:id="publishCollectionDialog"></div>
   <div style="display: none" wicket:id="deleteCollectionDialog"></div>
+  <div style="display: none" wicket:id="editPublishedCollectionDialog"></div>
   <div wicket:id="collectionsTable"></div>
 </wicket:panel>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowseEditableCollectionsPanel.java

@@ -90 +90 @@
                                             if (vc.isDeleted()) {
                                                 detailsItem.setVisible(false).setEnabled(false);
+                                                editItem.setVisible(false).setEnabled(false);
                                             }
                                             if (!vc.isPrivate()) {
-                                                editItem.setVisible(false).setEnabled(false);
                                                 publishItem.setVisible(false).setEnabled(false);
                                                 deleteItem.setVisible(false).setEnabled(false);
@@ -144 +144 @@
             if (vc.isDeleted()) {
                 detailsLink.setVisible(false).setEnabled(false);
+                editLink.setVisible(false).setEnabled(false);
             }
             if (!vc.isPrivate()) {
-                editLink.setVisible(false).setEnabled(false);
                 publishLink.setVisible(false).setEnabled(false);
                 deleteLink.setVisible(false).setEnabled(false);
@@ -212 +212 @@
     } // class BrowsePrivateCollectionsPage.PublishCollectionDialog
 
+    private final class EditPublishedCollectionDialog extends ConfirmationDialog {
+
+        private long vcId;
+
+        public EditPublishedCollectionDialog(String id,
+                final Component updateComponenet) {
+            super(id, updateComponenet);
+            setInitialWidth(400);
+        }
+
+        @Override
+        public void onConfirm(AjaxRequestTarget target) {
+            setResponsePage(EditVirtualCollectionPage.class, new PageParameters(Collections.singletonMap("id", vcId)));
+        }
+
+        public void showDialogue(AjaxRequestTarget target, VirtualCollection vc) {
+            this.vcId = vc.getId();
+            super.show(target,
+                    new StringResourceModel("collections.editpublishedconfirm",
+                            new VolatileEntityModel<>(vc)));
+        }
+    }
+
     private final PublishCollectionDialog publishDialog;
     private final DeleteCollectionDialog deleteDialog;
+    private final EditPublishedCollectionDialog editPublishedDialog;
 
     /**
-     * 
+     *
      * @param id panel id
      * @param provider provider for collections that should be shown
@@ -238 +262 @@
         add(table);
 
-        publishDialog = new PublishCollectionDialog("publishCollectionDialog",
-                table);
+        publishDialog = new PublishCollectionDialog("publishCollectionDialog", table);
         add(publishDialog);
-        deleteDialog = new DeleteCollectionDialog("deleteCollectionDialog",
-                table);
+        
+        deleteDialog = new DeleteCollectionDialog("deleteCollectionDialog", table);
         add(deleteDialog);
-    }
-
-    private void doEdit(AjaxRequestTarget target,
-            VirtualCollection vc) {
-        setResponsePage(EditVirtualCollectionPage.class, new PageParameters(Collections.singletonMap("id", vc.getId())));
+        
+        editPublishedDialog = new EditPublishedCollectionDialog("editPublishedCollectionDialog", table);
+        add(editPublishedDialog);
+
+    }
+
+    private void doEdit(AjaxRequestTarget target, VirtualCollection vc) {
+        if (vc.isPublic()) {
+            // ask for confirmation when trying to edit a published collection
+            editPublishedDialog.showDialogue(target, vc);
+        } else {
+            setResponsePage(EditVirtualCollectionPage.class, new PageParameters(Collections.singletonMap("id", vc.getId())));
+        }
     }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/EditVirtualCollectionPage.java

@@ -40 +40 @@
         // do not allow editing of VC's that are non-private or owned
         // by someone else! (except for admin)
-        if (!isUserAdmin() && 
-                (vc.getState() != State.PRIVATE
+        if (!isUserAdmin()
+                && ( //only allow editing of private & public
+                !(vc.getState() == State.PRIVATE || vc.getState() == State.PUBLIC)
+                // only allow editing by the owner
                 || !vc.getOwner().equalsPrincipal(getUser()))) {
             logger.warn("User {} attempts to edit virtual collection {} with state {} owned by {}", new Object[]{getUser().getName(), vc.getId(), vc.getState(), vc.getOwner().getName()});

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/User.java

@@ -102 +102 @@
         if (principal == null) {
             throw new NullPointerException("principal == null");
-        }
+    }
         return name.equals(principal.getName());
     }