Skip to content

[ROL-2161] Create new user improvements #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snoopdave merged 1 commit into from
Mar 15, 2020
Merged

[ROL-2161] Create new user improvements #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/resources/struts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,9 @@
<param name="pageTitle">userAdmin.title.createNewUser</param>
<result name="input" type="tiles">.UserEdit</result>
<result name="success" type="tiles">.UserAdmin</result>
<result name="cancel" type="redirectAction">
<param name="actionName">userAdmin</param>
</result>
<allowed-methods>execute,firstSave,save</allowed-methods>
</action>

Expand Down
59 changes: 49 additions & 10 deletions app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
<%-- Titling, processing actions different between add and edit --%>
<s:if test="actionName == 'createUser'">
<s:set var="subtitleKey">userAdmin.subtitle.createNewUser</s:set>
<s:set var="mainAction">createUser</s:set>
</s:if>
<s:else>
<s:set var="subtitleKey">userAdmin.subtitle.editUser</s:set>
<s:set var="mainAction">modifyUser</s:set>
</s:else>

<p class="subtitle">
Expand All @@ -51,27 +49,27 @@
</s:if>

<s:if test="actionName == 'modifyUser'">
<s:textfield name="bean.userName" size="30" maxlength="30"
<s:textfield name="bean.userName" size="30" maxlength="30" onkeyup="formChanged()"
label="%{getText('userSettings.username')}"
tooltip="%{getText('userSettings.tip.username')}"
readonly="true" cssStyle="background: #e5e5e5" />
</s:if>
<s:else>
<s:textfield name="bean.userName" size="30" maxlength="30"
<s:textfield name="bean.userName" size="30" maxlength="30" onkeyup="formChanged()"
label="%{getText('userSettings.username')}"
tooltip="%{getText('userAdmin.tip.username')}" />
</s:else>

<s:textfield name="bean.screenName" size="30" maxlength="30"
<s:textfield id="bean_userName" name="bean.screenName" size="30" maxlength="30" onkeyup="formChanged()"
label="%{getText('userSettings.screenname')}"
tooltip="%{getText('userAdmin.tip.screenName')}" />

<s:textfield name="bean.fullName" size="30" maxlength="30"
<s:textfield id="bean_fullName" name="bean.fullName" size="30" maxlength="30" onkeyup="formChanged()"
label="%{getText('userSettings.fullname')}"
tooltip="%{getText('userAdmin.tip.fullName')}" />

<s:if test="authMethod == 'ROLLERDB' || authMethod == 'DB_OPENID'">
<s:password name="bean.password" size="30" maxlength="30"
<s:password name="bean.password" size="30" maxlength="30" onkeyup="formChanged()"
label="%{getText('userSettings.password')}"
tooltip="%{getText('userAdmin.tip.password')}" />
</s:if>
Expand All @@ -82,7 +80,7 @@
tooltip="%{getText('userAdmin.tip.openIdUrl')}" />
</s:if>

<s:textfield name="bean.emailAddress" size="30" maxlength="30"
<s:textfield id="bean_email" name="bean.emailAddress" size="30" maxlength="255" onkeyup="formChanged()"
label="%{getText('userSettings.email')}"
tooltip="%{getText('userAdmin.tip.email')}" />

Expand Down Expand Up @@ -153,8 +151,49 @@
<br />

<div class="control">
<s:submit cssClass="btn btn-default" value="%{getText('generic.save')}" action="%{#mainAction}!save"/>
<s:submit cssClass="btn" value="%{getText('generic.cancel')}" action="modifyUser!cancel" />
<s:if test="actionName == 'createUser'">
<s:submit cssClass="btn btn-default" id="save_button"
value="%{getText('generic.save')}" action="createUser!save"/>
<s:submit cssClass="btn"
value="%{getText('generic.cancel')}" action="createUser!cancel" />
</s:if>
<s:else>
<s:submit cssClass="btn btn-default" id="save_button"
value="%{getText('generic.save')}" action="modifyUser!save"/>
<s:submit cssClass="btn"
value="%{getText('generic.cancel')}" action="modifyUser!cancel" />
</s:else>
</div>

</s:form>


<script>

document.forms[0].elements[0].focus();
let saveButton;

$( document ).ready(function() {
saveButton = $("#save_button");
formChanged()
});

function formChanged() {
let userName = $("#bean_userName:first").val();
let fullName = $("#bean_fullName:first").val();
let email = $("#bean_email:first").val();

let valid = (userName && userName.trim().length > 0
&& fullName && fullName.trim().length > 0
&& email && email.trim().length > 0
&& validateEmail(email));

if (valid) {
saveButton.attr("disabled", false);
} else {
saveButton.attr("disabled", true);
}
}

</script>

3 changes: 0 additions & 3 deletions app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,3 @@

</script>


</script>

4 changes: 1 addition & 3 deletions app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@

</div>

<%-- <s:text name="userRegister.tip.userName" /> --%>

</s:if>
<s:else>
<s:textfield label="%{getText('userSettings.username')}"
Expand All @@ -65,7 +63,7 @@
<s:textfield label="%{getText('userSettings.email')}"
tooltip="%{getText('userRegister.tip.email')}"
onkeyup="onChange()"
name="bean.emailAddress" size="40" maxlength="40" />
name="bean.emailAddress" size="40" maxlength="255" />

<s:if test="authMethod != 'LDAP'">

Expand Down