RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1556: Allow to choose between database or LDAP in user creation

Browse source 
FEA: ItEr77S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-11-16 12:16:14 +01:00
parent 6927955a4a
commit 637d03ff5c
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
View file

@ -284,16 +284,7 @@ public class UserCRUDController extends BaseCRUDController<User> implements
//because they are not directly associated to an attribute
passwordBox.setRawValue("");
passwordConfirmationBox.setRawValue("");
hideAuthenticationTypesCombo();
}
private void hideAuthenticationTypesCombo() {
Row comboRow = (Row) editWindow
.getFellowIfAny("authenticationTypeComboRow");
Row labelRow = (Row) editWindow
.getFellowIfAny("authenticationTypeLabelRow");
comboRow.setVisible(false);
labelRow.setVisible(true);
prepareAuthenticationTypesCombo();
}
@Override
@ -323,10 +314,7 @@ public class UserCRUDController extends BaseCRUDController<User> implements
Row comboRow = (Row) editWindow
.getFellowIfAny("authenticationTypeComboRow");
Row labelRow = (Row) editWindow
.getFellowIfAny("authenticationTypeLabelRow");
comboRow.setVisible(true);
labelRow.setVisible(false);
}
@Override
@ -489,6 +477,11 @@ public class UserCRUDController extends BaseCRUDController<User> implements
}
public void setAuthenticationType(Comboitem item) {
if (item == null) {
throw new WrongValueException(
editWindow.getFellowIfAny("authenticationTypeCombo"),
_("cannot be empty"));
}
UserAuthenticationType authenticationType = (UserAuthenticationType) item
.getValue();
User user = getUser();

4
libreplan-webapp/src/main/webapp/users/_editUser.zul
View file

@ -90,10 +90,6 @@
<combobox id="authenticationTypeCombo" autodrop="true"
onChange="controller.setAuthenticationType(self.selectedItem)" />
</row>
<row id="authenticationTypeLabelRow">
<label value="${i18n:_('Authentication type')}" />
<label value="@{controller.authenticationType}" />
</row>
</rows>
</grid>
</groupbox>