(), Configuration.isExampleUsersDisabled()) {
- @Override
- public boolean hasChangedDefaultPassword() {
- return getConfiguration().getChangedDefaultUserPassword();
- }
- },
ADMIN(Arrays.asList(UserRole.ROLE_SUPERUSER,
UserRole.ROLE_READ_ALL_PROJECTS,
UserRole.ROLE_EDIT_ALL_PROJECTS,
diff --git a/libreplan-webapp/src/main/webapp/common/layout/template.zul b/libreplan-webapp/src/main/webapp/common/layout/template.zul
index ce97ed667..848406ee4 100644
--- a/libreplan-webapp/src/main/webapp/common/layout/template.zul
+++ b/libreplan-webapp/src/main/webapp/common/layout/template.zul
@@ -36,7 +36,6 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
contextPath = Executions.getCurrent().getContextPath();
templateCtrl = templateController;
idAdminUser = templateController.getIdAdminUser();
- idUser = templateController.getIdUser();
idWsreader = templateController.getIdWsreaderUser();
idWswriter = templateController.getIdWswriterUser();
idWssubcontracting = templateController.getIdWssubcontractingUser();
@@ -102,7 +101,7 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
- ${i18n:_('user')}: ${desktop.execution.userPrincipal.name}
+ ${i18n:_('user')}: ${templateController.username}
[${i18n:_('Log out')}]
@@ -143,9 +142,6 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
class="footer-messages-area"
style="display:${templateCtrl.defaultPasswdVisible}">
- [user]
[wsreader]
diff --git a/libreplan-webapp/src/main/webapp/js/defaultPasswordWarnings.js b/libreplan-webapp/src/main/webapp/js/defaultPasswordWarnings.js
index 87e6f671d..8d4d1866a 100644
--- a/libreplan-webapp/src/main/webapp/js/defaultPasswordWarnings.js
+++ b/libreplan-webapp/src/main/webapp/js/defaultPasswordWarnings.js
@@ -1,7 +1,7 @@
/*
* This file is part of LibrePlan
*
- * Copyright (C) 2011 Igalia, S.L.
+ * Copyright (C) 2011-2012 Igalia, S.L.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -17,22 +17,22 @@
* along with this program. If not, see .
*/
-function showOrHideDefaultPasswordWarnings(adminNotDefaultPassword,
- userNotDefaultPassword, wsreaderNotDefaultPassword,
- wswriterNotDefaultPassword, wssubcontractingNotDefaultPassword) {
+function showOrHideDefaultPasswordWarnings(
+ adminNotDefaultPassword,
+ wsreaderNotDefaultPassword,
+ wswriterNotDefaultPassword,
+ wssubcontractingNotDefaultPassword) {
setDisplayNoneOrInline(document.getElementById("warningDefaultPasswdadmin"),
adminNotDefaultPassword);
var otherDefaultPassword = adminNotDefaultPassword &&
- (!userNotDefaultPassword || !wsreaderNotDefaultPassword ||
+ (!wsreaderNotDefaultPassword ||
!wswriterNotDefaultPassword || !wssubcontractingNotDefaultPassword);
setDisplayNoneOrInline(document.getElementById("warningDefaultPasswdOthers"),
!otherDefaultPassword);
if (otherDefaultPassword) {
- setDisplayNoneOrInline(document.getElementById("warningDefaultPasswduser"),
- userNotDefaultPassword);
setDisplayNoneOrInline(document.getElementById("warningDefaultPasswdwsreader"),
wsreaderNotDefaultPassword);
setDisplayNoneOrInline(document.getElementById("warningDefaultPasswdwswriter"),