Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[16157] dcm4chee/dcm4chee-web-common/trunk/src/main
|
From: <rob...@us...> - 2011-10-27 08:36:12
|
Revision: 16157
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=16157&view=rev
Author: robertdavid
Date: 2011-10-27 08:36:06 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
[#WEB-572] Waiting for open windows on logout confirmation window unnesseccarily displays YES and NO buttons
Modified Paths:
--------------
dcm4chee/dcm4chee-web-common/trunk/src/main/java/org/dcm4chee/web/common/base/ModuleSelectorPanel.java
dcm4chee/dcm4chee-web-common/trunk/src/main/java/org/dcm4chee/web/common/markup/modal/ConfirmationWindow.java
dcm4chee/dcm4chee-web-common/trunk/src/main/resources/org/dcm4chee/web/package.properties
dcm4chee/dcm4chee-web-common/trunk/src/main/resources/org/dcm4chee/web/package_de.properties
Modified: dcm4chee/dcm4chee-web-common/trunk/src/main/java/org/dcm4chee/web/common/base/ModuleSelectorPanel.java
===================================================================
--- dcm4chee/dcm4chee-web-common/trunk/src/main/java/org/dcm4chee/web/common/base/ModuleSelectorPanel.java 2011-10-27 06:53:09 UTC (rev 16156)
+++ dcm4chee/dcm4chee-web-common/trunk/src/main/java/org/dcm4chee/web/common/base/ModuleSelectorPanel.java 2011-10-27 08:36:06 UTC (rev 16157)
@@ -100,10 +100,11 @@
@Override
public void onConfirmation(AjaxRequestTarget target,
- List<ProgressProvider> providers) {
+ List<ProgressProvider> providers) {
if (closePopups(providers)) {
throw new IllegalStateException(ModuleSelectorPanel.this.getString("logout.logout"));
- } else if (isPopupOpen(providers)) {
+ }
+ else if (isPopupOpen(providers)) {
throw new IllegalStateException(ModuleSelectorPanel.this.getString("logout.waiting"));
}
doLogout();
@@ -245,6 +246,7 @@
showLogout = show;
return this;
}
+
private boolean closePopups(List<ProgressProvider> providers) {
boolean b = false;
if (providers != null) {
Modified: dcm4chee/dcm4chee-web-common/trunk/src/main/java/org/dcm4chee/web/common/markup/modal/ConfirmationWindow.java
===================================================================
--- dcm4chee/dcm4chee-web-common/trunk/src/main/java/org/dcm4chee/web/common/markup/modal/ConfirmationWindow.java 2011-10-27 06:53:09 UTC (rev 16156)
+++ dcm4chee/dcm4chee-web-common/trunk/src/main/java/org/dcm4chee/web/common/markup/modal/ConfirmationWindow.java 2011-10-27 08:36:06 UTC (rev 16157)
@@ -182,6 +182,8 @@
private Label msgLabel;
private Label remarkLabel;
+ private boolean logout = false;
+
public MessageWindowPanel(String id) {
super(id);
@@ -224,7 +226,8 @@
close(target);
}
} catch (Exception x) {
- messageWindowPanel.msg =new Model<String>(x.getMessage());
+ logout = true;
+ setStatus(new Model<String>(x.getMessage()));
target.addComponent(MessageWindowPanel.this);
}
}
@@ -266,7 +269,7 @@
public boolean isVisible() {
return !hasStatus;
}
- }.add(new Label("declineLabel", decline)) );
+ }.add(new Label("declineLabel", decline)));
add(new AjaxFallbackLink<Object>("cancel"){
private static final long serialVersionUID = 1L;
@@ -283,13 +286,16 @@
}
}.add(new Label("cancelLabel", cancel)) );
- add(okBtn = new AjaxFallbackLink<Object>("ok") {
+ add(okBtn = new IndicatingAjaxFallbackLink<Object>("ok") {
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
- onOk(target);
+ if (logout)
+ onConfirmation(target, userObject);
+ else
+ onOk(target);
msg = null;
close(target);
}
@@ -298,6 +304,16 @@
public boolean isVisible() {
return hasStatus;
}
+
+ @Override
+ protected IAjaxCallDecorator getAjaxCallDecorator() {
+ try {
+ return macb.getAjaxCallDecorator();
+ } catch (Exception e) {
+ log.error("Failed to get IAjaxCallDecorator: ", e);
+ }
+ return null;
+ }
});
getOkBtn().add(new Label("okLabel", new ResourceModel("okBtn")));
getOkBtn()
Modified: dcm4chee/dcm4chee-web-common/trunk/src/main/resources/org/dcm4chee/web/package.properties
===================================================================
--- dcm4chee/dcm4chee-web-common/trunk/src/main/resources/org/dcm4chee/web/package.properties 2011-10-27 06:53:09 UTC (rev 16156)
+++ dcm4chee/dcm4chee-web-common/trunk/src/main/resources/org/dcm4chee/web/package.properties 2011-10-27 08:36:06 UTC (rev 16157)
@@ -14,16 +14,16 @@
login.tabTitle=User login
loginLabel=User login at {0}
logout=Logout ({0})
-logout.confirmPendingTasks=Pop-up pages with pending tasks open! Do you want to close the windows and logout?
-logout.logout=Please wait a moment for closing pop-ups before logout!
-logout.waiting=Pop-ups still open! Try again.
+logout.confirmPendingTasks=Pop-up pages with pending tasks open. Do you want to close the windows and logout?
+logout.logout=All pop-up pages were closed. Logging out.
+logout.waiting=Pop-up pages still open. Try again.
#Message Window
msgwindow.title.info=Info
msgwindow.title.warn=Warning
msgwindow.title.error=Error
msgwindow.msg.GroupLengthElementNotAllowed=Attribute tag (xxxx,0000) is not allowed (GroupLength Element)
-msgwindow.msg.EditNotAllowed=Attribute tag is not editable!
+msgwindow.msg.EditNotAllowed=Attribute tag is not editable.
application.home=Back to home page
application.homeLogin=Back
Modified: dcm4chee/dcm4chee-web-common/trunk/src/main/resources/org/dcm4chee/web/package_de.properties
===================================================================
--- dcm4chee/dcm4chee-web-common/trunk/src/main/resources/org/dcm4chee/web/package_de.properties 2011-10-27 06:53:09 UTC (rev 16156)
+++ dcm4chee/dcm4chee-web-common/trunk/src/main/resources/org/dcm4chee/web/package_de.properties 2011-10-27 08:36:06 UTC (rev 16157)
@@ -13,16 +13,16 @@
login.tabTitle=Benutzeranmeldung
loginLabel=Benutzeranmeldung an {0}
logout=Abmelden ({0})
-logout.confirmPendingTasks=Fenster mit aktiven Auftr\xE4gen (Export,..) sind offen und werden beim Abmelden geschlossen! Mit Abmeldung fortfahren?
-logout.logout=Einen Moment. Popup Fenster werden geschlossen. Abmelden?
-logout.waiting=Es sind noch Fenster offen! Versuchen sie es nocheinmal.
+logout.confirmPendingTasks=Popup-Fenster mit aktiven Auftr\xE4gen (Export,..) sind offen und werden beim Abmelden geschlossen. Mit der Abmeldung fortfahren?
+logout.logout=Alle Popup-Fenster wurden geschlossen. Abmeldung wird durchgef\xFChrt.
+logout.waiting=Es sind noch Popup-Fenster offen. Versuchen sie es noch einmal.
#Message Window
msgwindow.title.info=Information
msgwindow.title.warn=Warnung
msgwindow.title.error=Fehler
msgwindow.msg.GroupLengthElementNotAllowed=Attribute Tag (xxxx,0000) ist nicht erlaubt (GroupLength Element)
-msgwindow.msg.EditNotAllowed=Attribute Tag ist nicht editierbar!
+msgwindow.msg.EditNotAllowed=Attribute Tag ist nicht editierbar.
application.homeLogin=Zur\xFCck zur Anmeldung
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|