zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/SafeExamBrowser/seb-server.git into development

Browse source
This commit is contained in:
anhefti 2022-04-13 16:08:09 +02:00
commit e6697dd340
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ch/ethz/seb/sebserver/gui/content/admin/UserAccountChangePasswordForm.java
View file

@ -54,6 +54,8 @@ public class UserAccountChangePasswordForm implements TemplateComposer {
new LocTextKey("sebserver.useraccount.form.password.new.confirm");
private static final LocTextKey FORM_PASSWORD_TEXT_KEY =
new LocTextKey("sebserver.useraccount.form.password");
private static final String PASSWORD_CHANGE_INFO_KEY =
"sebserver.useraccount.form.password.info";
private final PageService pageService;
private final RestService restService;
@ -85,6 +87,11 @@ public class UserAccountChangePasswordForm implements TemplateComposer {
pageContext.getParent(),
new LocTextKey(FORM_TITLE_KEY, userInfo.username));
widgetFactory.labelLocalized(
content,
WidgetFactory.CustomVariant.SUBTITLE,
new LocTextKey(PASSWORD_CHANGE_INFO_KEY, userInfo.username));
final boolean ownAccount = this.currentUser.get().uuid.equals(entityKey.getModelId());
// The Password Change form

5
src/main/resources/messages.properties
View file

@ -264,8 +264,8 @@ sebserver.useraccount.form.timezone=Time Zone
sebserver.useraccount.form.timezone.tooltip=The time-zone of the user<br/><br/>Note that this also defines the exact time and date that is displayed to the user
sebserver.useraccount.form.roles=User Roles
sebserver.useraccount.form.roles.tooltip=The roles of the user<br/>A user can have more then one role but must have at least one.<br/><br/>In Edit mode, please use the tooltip on the role name for more information about a specific role.
sebserver.useraccount.form.password=Password
sebserver.useraccount.form.password.tooltip=The password of the user account
sebserver.useraccount.form.password=Your Password
sebserver.useraccount.form.password.tooltip=The password of your user account
sebserver.useraccount.form.password.confirm=Confirm Password
sebserver.useraccount.form.password.confirm.tooltip=Please confirm the password
sebserver.useraccount.form.pwchange.title=Change Password : {0}
@ -273,6 +273,7 @@ sebserver.useraccount.form.password.new=New Password
sebserver.useraccount.form.password.new.tooltip=The new password for the user account
sebserver.useraccount.form.password.new.confirm=Confirm New Password
sebserver.useraccount.form.password.new.confirm.tooltip=Please confirm the password
sebserver.useraccount.form.password.info=To change the password of user with account {0},<br/>please enter your own password first and then the new password for the user account and confirm the new password.
sebserver.useraccount.delete.form.title=Delete User Account
sebserver.useraccount.delete.form.info=Please Note:<br/>&nbsp;&nbsp;&nbsp;&nbsp;This deletes the particular User Account with all selected dependencies.<br/>&nbsp;&nbsp;&nbsp;&nbsp;The User Account and selected dependent exams and exam configurations, will be lost after deletion.<br/>&nbsp;&nbsp;&nbsp;&nbsp;Please use the "Show Report" action below to see a report of all objects that will be<br/>&nbsp;&nbsp;&nbsp;&nbsp;deleted and check them carefully.