Skip to content
Snippets Groups Projects
Commit 498297ae authored by Barbara B. Frosik's avatar Barbara B. Frosik
Browse files

changed default of is_local_user to true in user_info table and related files

parent 51595dbc
No related branches found
No related tags found
No related merge requests found
......@@ -217,13 +217,6 @@ public class UserInfoController extends CrudEntityController<UserInfo, UserInfoF
return super.getAvailableItems();
}
@Override
public String prepareCreate() {
current = createEntityInstance();
current.setIsDmUser(true);
return "create?faces-redirect=true";
}
@Override
public String prepareEdit(UserInfo user) {
passwordEntry = null;
......
......@@ -90,8 +90,8 @@ public class UserInfo extends CloneableEntity
@Column(name = "password")
private String password;
@NotNull
@Column(name = "is_dm_user")
private boolean isDmUser;
@Column(name = "is_local_user")
private boolean isLocalUser;
@ManyToMany(mappedBy = "userInfoList")
private List<RoleType> roleTypeList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "userInfo")
......@@ -193,12 +193,12 @@ public class UserInfo extends CloneableEntity
this.password = password;
}
public boolean isIsDmUser() {
return isDmUser;
public boolean isIsLocalUser() {
return isLocalUser;
}
public void setIsDmUser(boolean isDmUser) {
this.isDmUser = isDmUser;
public void setIsLocalUser(boolean isLocalUser) {
this.isLocalUser = isLocalUser;
}
@XmlTransient
......
......@@ -33,8 +33,8 @@
<h:outputLabel for="email" value="Email" styleClass="entityDataLabel"/>
<h:inputText id="email" value="#{userInfoObject.email}" title="Email" styleClass="entityDataInputText"/>
<h:outputLabel for="password" value="Password" styleClass="entityDataLabel" rendered="#{userInfoObject.isDmUser}"/>
<p:password id="password" rendered="#{userInfoObject.isDmUser}" value="#{userInfoController.passwordEntry}" title="Password" feedback="true" styleClass="entityDataInputText"/>
<h:outputLabel for="password" value="Password" styleClass="entityDataLabel" rendered="#{userInfoObject.isLocalUser}"/>
<p:password id="password" rendered="#{userInfoObject.isLocalUser}" value="#{userInfoController.passwordEntry}" title="Password" feedback="true" styleClass="entityDataInputText"/>
<h:outputLabel for="globusUsername" value="Globus Username" styleClass="entityDataLabel"/>
<h:inputText id="globusUsername" value="#{userInfoObject.globusUsername}" title="Globus Username" styleClass="entityDataInputText"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment