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

Replace "Login name" for "Username"

Browse source 
FEA: ItEr76S27ResourceBinding
This commit is contained in:
Manuel Rego Casasnovas 2012-05-09 13:36:48 +02:00
parent cc92ce809d
commit da64d3bd26
18 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/src/user/en/16-ldap-authentication.rst
View file

@ -40,8 +40,8 @@ Authentication
==============
Here can be configured the property in LDAP nodes where should be found the
given login name. The property *UserId* must be filled with the name of the
property where the login name is stored in LDAP.
given username. The property *UserId* must be filled with the name of the
property where the username is stored in LDAP.
The checkbox *Save passwords in database* when it is checked, means that the
password is stored also in LibrePlan database. In this way, if LDAP is offline

18
libreplan-business/src/main/java/org/libreplan/business/users/daos/IUserDAO.java
View file

@ -39,34 +39,36 @@ import org.libreplan.business.users.entities.User;
public interface IUserDAO extends IGenericDAO<User, Long>{
/**
* NOTE: Login name comparison is case-insensitive.
* NOTE: Username comparison is case-insensitive.
*/
public User findByLoginName(String loginName)
throws InstanceNotFoundException;
/**
* NOTE: Login name comparison is case-insensitive, and the method is
* executed in another transaction.
* NOTE: Username comparison is case-insensitive, and the method is executed
* in another transaction.
*/
public User findByLoginNameAnotherTransaction(String loginName)
throws InstanceNotFoundException;
/**
* NOTE: Login name comparison is case-insensitive.
* NOTE: Username comparison is case-insensitive.
*/
public boolean existsByLoginName(String loginName);
/**
* NOTE: Login name comparison is case-insensitive, and the method is
* executed in another transaction.
* NOTE: Username comparison is case-insensitive, and the method is executed
* in another transaction.
*/
public boolean existsByLoginNameAnotherTransaction(String loginName);
/**
* Finds a User entity by its loginName, among those with the disabled
* attribute set to false.
* @param loginName loginName to perform the search. NOTE: Login name
* comparison is case-insensitive.
*
* @param loginName
* loginName to perform the search. NOTE: Username comparison is
* case-insensitive.
* @return a {@link User} object.
* @throws InstanceNotFoundException
*/

4
libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
View file

@ -110,7 +110,7 @@ public class User extends BaseEntity implements IHumanIdentifiable{
return create(new User(loginName, password, email));
}
@NotEmpty(message = "login name not specified")
@NotEmpty(message = "username not specified")
public String getLoginName() {
return loginName;
}
@ -208,7 +208,7 @@ public class User extends BaseEntity implements IHumanIdentifiable{
return isInRole(UserRole.ROLE_ADMINISTRATION);
}
@AssertTrue(message = "login name is already being used by another user")
@AssertTrue(message = "username is already being used by another user")
public boolean checkConstraintUniqueLoginName() {
IUserDAO userDAO = Registry.getUserDAO();

2
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java
View file

@ -44,7 +44,7 @@ public class UserBandboxFinder extends BandboxFinder implements IBandboxFinder {
@Autowired
private IUserDAO userDAO;
private final String headers[] = { _("Login name"), _("Full name") };
private final String headers[] = { _("Username"), _("Full name") };
/**
* Forces to mark the string as needing translation

2
libreplan-webapp/src/main/java/org/libreplan/web/users/bootstrap/MandatoryUser.java
View file

@ -34,7 +34,7 @@ import org.libreplan.business.common.exceptions.InstanceNotFoundException;
import org.libreplan.business.users.entities.UserRole;
/**
* It enumerates the mandatory users (login names) for running the application.<br />
* It enumerates the mandatory users (usernames) for running the application.<br />
*
* <code>ADMIN</code> user will be always enabled, however <code>USER</code>,
* <code>WSREADER</code> and <code>WSWRITER</code> could be disabled in

4
libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java
View file

@ -63,8 +63,8 @@ public class DBUserDetailsService implements UserDetailsService {
try {
user = userDAO.findByLoginName(loginName);
} catch (InstanceNotFoundException e) {
throw new UsernameNotFoundException(_("User with login name " +
"'{0}': not found", loginName));
throw new UsernameNotFoundException(_(
"User with username '{0}': not found", loginName));
}
Scenario scenario = user.getLastConnectedScenario();

2
libreplan-webapp/src/main/java/org/libreplan/web/users/services/IDBPasswordEncoderService.java
View file

@ -36,7 +36,7 @@ public interface IDBPasswordEncoderService {
/**
* Encodes a clear password. The second parameter (which must be the
* login name) may be used as a salt.
* username) may be used as a salt.
*/
public String encodePassword(String clearPassword, String loginName);

2
libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java
View file

@ -62,7 +62,7 @@ public class LDAPUserDetailsService implements UserDetailsService {
try {
user = userDAO.findByLoginName(loginName);
} catch (InstanceNotFoundException e) {
throw new UsernameNotFoundException(_("User with login name "
throw new UsernameNotFoundException(_("User with username "
+ "'{0}': not found", loginName));
}

2
libreplan-webapp/src/main/webapp/resources/worker/_edition.zul
View file

@ -137,7 +137,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Login name')}" />
<label value="${i18n:_('Username')}" />
<textbox id="loginName" width="300px" />
</row>
<row>

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

@ -44,7 +44,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Login name')}" />
<label value="${i18n:_('Username')}" />
<textbox id="loginName"
value="@{controller.user.loginName}" width="300px"
constraint="no empty:${i18n:_('cannot be null or empty')}"

2
libreplan-webapp/src/main/webapp/users/_listUsers.zul
View file

@ -24,7 +24,7 @@
pageSize="10" sclass="clickable-rows"
rowRenderer="@{controller.usersRenderer}">
<columns sizable="true">
<newdatasortablecolumn label="${i18n:_('User login name')}" sort="auto(loginName)" />
<newdatasortablecolumn label="${i18n:_('Username')}" sort="auto(loginName)" />
<newdatasortablecolumn label="${i18n:_('Disabled')}" />
<newdatasortablecolumn label="${i18n:_('Administrator')}" />
<newdatasortablecolumn label="${i18n:_('Authentication type')}" />

2
scripts/functional-tests/account/password_test.sah
View file

@ -75,7 +75,7 @@ function commonUserCreate($name, $password) {
}
function commonUserForm($name, $password) {
_setValue(_textbox(0, _near(_span("Login name"))), $name);
_setValue(_textbox(0, _near(_span("Username"))), $name);
_setValue(_password(0, _near(_span("Password"))), $password);
_setValue(_password(0, _near(_span("Password confirmation"))), $password);
_click(_cell("Save"));

2
scripts/functional-tests/users/profile_test.sah
View file

@ -71,7 +71,7 @@ function profileAssign($account, $password, $profile){
}
function accountsForm($name, $password, $profile) {
_setValue(_textbox(0, _near(_span("Login name"))), $name);
_setValue(_textbox(0, _near(_span("Username"))), $name);
_setValue(_password(0, _near(_span("Password"))), $password);
_setValue(_password(0, _near(_span("Password confirmation"))), $password);
_click(_textbox(0, _near(_cell("Add role"))));

10
scripts/functional-tests/users/user_test.sah
View file

@ -76,7 +76,7 @@ function accountsCreateTwoUserSamePass($name, $password) {
function accountsCreateTwoPass($name, $password, $newPassword){
commonCreate("Accounts");
_setValue(_textbox(0, _near(_span("Login name"))), $name);
_setValue(_textbox(0, _near(_span("Username"))), $name);
_setValue(_password(0, _near(_span("Password"))), $password);
_setValue(_password(0, _near(_span("Password confirmation"))), $newPassword);
_click(_cell("Save"));
@ -86,7 +86,7 @@ function accountsCreateTwoPass($name, $password, $newPassword){
}
function accountsForm($name, $password) {
_setValue(_textbox(0, _near(_span("Login name"))), $name);
_setValue(_textbox(0, _near(_span("Username"))), $name);
_setValue(_password(0, _near(_span("Password"))), $password);
_setValue(_password(0, _near(_span("Password confirmation"))), $password);
_click(_cell("Save"));
@ -94,8 +94,8 @@ function accountsForm($name, $password) {
/* test to check a that LibrePlan give us a error */
function accountsNotValid(){
_assertExists(_span("checkConstraintUniqueLoginName: login name is already being used by another user"));
_assert(_isVisible(_span("checkConstraintUniqueLoginName: login name is already being used by another user")));
_assertExists(_span("checkConstraintUniqueLoginName: username is already being used by another user"));
_assert(_isVisible(_span("checkConstraintUniqueLoginName: username is already being used by another user")));
}
function accountsComprobateUser($name, $Password) {
@ -106,7 +106,7 @@ function accountsComprobateUser($name, $Password) {
function accountsEdit($oldName, $newName, $newPassword, $cell) {
_click(_link("Accounts"));
commonEdit($oldName, $cell);
_setValue(_textbox(0, _near(_span("Login name"))), $newName);
_setValue(_textbox(0, _near(_span("Username"))), $newName);
_setValue(_password(0, _near(_span("Password"))), $newPassword);
_setValue(_password(0, _near(_span("Password confirmation"))), $newPassword);
_click(_textbox(0, _near(_cell("Add role"))));

2
scripts/rest-clients/export-resources-hours.sh
View file

@ -2,7 +2,7 @@
. ./rest-common-env.sh
printf "Login name: "
printf "Username: "
read loginName
printf "Password: "
read password

2
scripts/rest-clients/export.sh
View file

@ -2,7 +2,7 @@
. ./rest-common-env.sh
printf "Login name: "
printf "Username: "
read loginName
printf "Password: "
read password

2
scripts/rest-clients/get-xml-schema.sh
View file

@ -2,7 +2,7 @@
. ./rest-common-env.sh
printf "Login name: "
printf "Username: "
read loginName
printf "Password: "
read password

2
scripts/rest-clients/import.sh
View file

@ -2,7 +2,7 @@
. ./rest-common-env.sh
printf "Login name: "
printf "Username: "
read loginName
printf "Password: "
read password