Changeset 1092

Timestamp:

07/14/09 12:21:08 (4 years ago)

Author:

glickn

Message:

Fixes #453 & #454 - Users will no longer see an edit or delete button for on a subsample or sample that they do not have permission to edit.

Users will no longer be able to add a subsample or a chemical analysis to a sample/subsample that they do not own. The link is still there, but if it is clicked and they do not have permission to add one, it will display a warning saying so. If the user is not logged in when they click the link, it will prompt them to log in.

Location:

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details

Files:

• SampleDetails.java (modified) (4 diffs)
• SubsampleDetails.java (modified) (5 diffs)

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/SampleDetails.java

@@ -43 +43 @@
 import edu.rpi.metpetdb.client.ui.commands.ServerOp;
 import edu.rpi.metpetdb.client.ui.dialogs.ConfirmationDialogBox;
+import edu.rpi.metpetdb.client.ui.dialogs.MDialogBox;
 import edu.rpi.metpetdb.client.ui.input.ObjectEditorPanel;
 import edu.rpi.metpetdb.client.ui.input.OnEnterPanel;
@@ -138 +139 @@
 
                         protected boolean canEdit() {
-                                // TODO temporary while testing permissions
-                                // final Sample s = (Sample) getBean();
-                                // if (s.isPublicData())
-                                // return false;
-                                // if (MpDb.isCurrentUser(s.getOwner()))
-                                // return true;
-                                // return false;
-                                return true;
+                                final Sample s = (Sample) getBean();
+                                if (MpDb.isCurrentUser(s.getOwner()))
+                                        return true;
+                                return false;
                         }
 
@@ -202 +199 @@
                                         @Override
                                         public void command() {
-                                                History.newItem(TokenSpace.createNewSubsample(p_sample
+                                                if(canEdit()){
+                                                        History.newItem(TokenSpace.createNewSubsample(p_sample
                                                                 .getBean()));
+                                                } else {
+                                                        noPermissionWarning();
+                                                }
                                         }
                                 }.begin();
@@ -512 +513 @@
         }
         
+        private boolean canEdit(){
+                final Sample s = (Sample) p_sample.getBean();
+                return MpDb.isCurrentUser(s.getOwner());
+        }
+        
+        private void noPermissionWarning(){
+                final MDialogBox noPermissionBox = new MDialogBox();
+                final FlowPanel container = new FlowPanel();
+                container.add(new Label("You do not have the correct permissions to add a subsample."));
+                Button ok = new Button("Ok");
+                ok.addClickListener(new ClickListener(){
+                        public void onClick(final Widget sender){
+                                noPermissionBox.hide();
+                        }
+                });
+                container.add(ok);
+                noPermissionBox.setWidget(container);
+                noPermissionBox.show();
+        }
+        
         private void makeImagesPublicIfPublic(Sample sample) {
                 //If it's private, just return, images default to private

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/SubsampleDetails.java

@@ -5 +5 @@
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HasVerticalAlignment;
@@ -26 +28 @@
 import edu.rpi.metpetdb.client.ui.commands.VoidLoggedInOp;
 import edu.rpi.metpetdb.client.ui.dialogs.ConfirmationDialogBox;
+import edu.rpi.metpetdb.client.ui.dialogs.MDialogBox;
 import edu.rpi.metpetdb.client.ui.input.ObjectEditorPanel;
 import edu.rpi.metpetdb.client.ui.input.OnEnterPanel;
@@ -95 +98 @@
 
                         protected boolean canEdit() {
-                                // TODO temporary while testing permissions
-                                // final Sample s = ((Subsample) getBean()).getSample();
-                                // if (s.isPublicData())
-                                // return false;
-                                // if (MpDb.isCurrentUser(s.getOwner()))
-                                // return true;
-                                // return false;
-                                return true;
+                                final Subsample s = ((Subsample) getBean());
+                                if (MpDb.isCurrentUser(s.getOwner()))
+                                        return true;
+                                return false;
                         }
 
@@ -171 +170 @@
                                 new VoidLoggedInOp() {
                                         public void command() {
-                                                History.newItem(TokenSpace
+                                                if(canEdit()){
+                                                        History.newItem(TokenSpace
                                                                 .createNewChemicalAnalysis(p_subsample
                                                                                 .getBean()));
+                                                } else {
+                                                        noPermissionWarning();
+                                                }
                                         }
                                 }.begin();
@@ -233 +236 @@
         }
         
+        private boolean canEdit(){
+                final Subsample s = ((Subsample) p_subsample.getBean());
+                return MpDb.isCurrentUser(s.getOwner());
+        }
+        
+        private void noPermissionWarning(){
+                final MDialogBox noPermissionBox = new MDialogBox();
+                final FlowPanel container = new FlowPanel();
+                container.add(new Label("You do not have the correct permissions to add a chemical analysis."));
+                Button ok = new Button("Ok");
+                ok.addClickListener(new ClickListener(){
+                        public void onClick(final Widget sender){
+                                noPermissionBox.hide();
+                        }
+                });
+                container.add(ok);
+                noPermissionBox.setWidget(container);
+                noPermissionBox.show();
+        }
+        
         private void makeImagesPublicIfPublic(Subsample subsample){
                 //If it's private, just return, images default to private