[dcm4che-commits] SF.net SVN: dcm4che:[16380] dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/ src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java

[<jav...@us...>]

Revision: 16380
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=16380&view=rev
Author:   javawilli
Date:     2011-11-30 21:44:36 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
[#WEB-635] In folder, if editing a too old object, an empty window with a Ok button is shown, should be DicomEditor

Modified Paths:
--------------
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java	2011-11-30 21:17:52 UTC (rev 16379)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java	2011-11-30 21:44:36 UTC (rev 16380)
@@ -770,13 +770,17 @@
             @Override
             public void onConfirmation(AjaxRequestTarget target, final AbstractEditableDicomModel model) {
                 logSecurityAlert(model, true, StudyListPage.tooOldAuditMessageText);
-                
-                modalWindow.setContent(getEditDicomObjectPanel(model));
-                modalWindow.setTitle("");
-                modalWindow.show(target);
-                setStatus(new Model<String>(""));
             }
         };
+        confirmEdit.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
+            private static final long serialVersionUID = 1L;
+            public void onClose(AjaxRequestTarget target) {
+                if (confirmEdit.getState() == ConfirmationWindow.CONFIRMED) {
+                    modalWindow.setContent(getEditDicomObjectPanel(confirmEdit.getUserObject()));
+                    modalWindow.show(target);
+                }
+            }
+        });
         confirmEdit.setInitialHeight(150);
         form.add(confirmEdit);
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.