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

some bug fixes and message updates

Browse source
This commit is contained in:
anhefti 2019-09-12 09:15:14 +02:00
parent 1338407b21
commit 96cad3155a
5 changed files with 44 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
View file

@ -412,8 +412,8 @@ public class ActivitiesPane implements TemplateComposer {
this.pageService.executePageAction(
action,
result -> {
if (result.hasError()) {
resultAction -> {
if (resultAction.hasError()) {
tree.deselect(treeItem);
if (currentState != null) {
final TreeItem item = findItemByActionDefinition(
@ -543,6 +543,7 @@ public class ActivitiesPane implements TemplateComposer {
this.navigation.getItems(),
event.action.definition.targetState.activityAnchor());
if (item != null) {
this.navigation.deselectAll();
this.navigation.select(item);
}
}

3
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageContextImpl.java
View file

@ -333,8 +333,9 @@ public class PageContextImpl implements PageContext {
e);
this.onOK.accept(false);
}
} else {
this.onOK.accept(false);
}
this.onOK.accept(false);
}
}

3
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java
View file

@ -156,9 +156,6 @@ public class PageServiceImpl implements PageService {
@Override
public void executePageAction(final PageAction pageAction, final Consumer<Result<PageAction>> callback) {
final PageState currentState = getCurrentState();
// TODO should there be a check to reload or not to reload the page if the state is the same?
if (!pageAction.ignoreMoveAwayFromEdit && currentState != null && currentState.type() == Type.FORM_EDIT) {
pageAction.pageContext().applyConfirmDialog(
MSG_GO_AWAY_FROM_EDIT,

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

@ -6,16 +6,16 @@ sebserver.overall.version=SEB Server Version : {0}
sebserver.overall.help=Documentation
sebserver.overall.help.link=https://www.safeexambrowser.org/news_en.html
sebserver.overall.message.leave.without.save=You are leaving this page without saved changes!\nThe unsaved changes will be lost.\Are you sure to leave the page?
sebserver.overall.message.leave.without.save=You have unsaved changes!\nAre you sure you want to leave the page?\The changes will be lost.
sebserver.overall.upload=Please Select
sebserver.overall.action.modify.cancel=Cancel
sebserver.overall.action.modify.cancel.confirm=Are you sure to cancel? Modifications will be lost.
sebserver.overall.action.filter=Apply Filter
sebserver.overall.action.filter.clear=Clear Filter Criteria
sebserver.overall.action.modify.cancel.confirm=Are you sure you want to cancel? Modifications will be lost.
sebserver.overall.action.filter=Apply filter
sebserver.overall.action.filter.clear=Clear filter criteria
sebserver.overall.action.ok=OK
sebserver.overall.action.cancel=Cancel
sebserver.overall.action.close=Close
sebserver.overall.action.goAwayFromEditPageConfirm=Are you sure to leave this page? Any unsaved data will be lost.
sebserver.overall.action.goAwayFromEditPageConfirm=Are you sure you want to leave this page? Unsaved data will be lost.
sebserver.overall.action.category.varia=Varia
sebserver.overall.status.active=Active
@ -61,25 +61,25 @@ sebserver.overall.activity.title.monitoring=Monitoring
# Form validation and messages
################################
sebserver.form.validation.error.title=Form Data Validation Failed
sebserver.form.validation.error.title=Form data validation failed
sebserver.form.validation.error.message=There is missing or incorrect form data.
sebserver.form.validation.fieldError.size=The size must be between {3} and {4}
sebserver.form.validation.fieldError.name=Name is mandatory and must have a size between {3} and {4} character
sebserver.form.validation.fieldError.urlSuffix=URL Suffix must have a size between {3} and {4} character
sebserver.form.validation.fieldError.name=The Name is mandatory and must have a size between {3} and {4} character
sebserver.form.validation.fieldError.urlSuffix=The URL Suffix must have a size between {3} and {4} character
sebserver.form.validation.fieldError.notNull=This field is mandatory
sebserver.form.validation.fieldError.username.notunique=This Username is already in use. Please choose another one.
sebserver.form.validation.fieldError.name.notunique=This name already exists. Please choose another one.
sebserver.form.validation.fieldError.password.wrong=Old password is wrong
sebserver.form.validation.fieldError.password.mismatch=Re-typed password don't match new password
sebserver.form.validation.fieldError.password.wrong=The old password is wrong
sebserver.form.validation.fieldError.password.mismatch=The re-typed password doesn't match the new password
sebserver.form.validation.fieldError.invalidURL=The input does not match the URL pattern.
sebserver.form.validation.fieldError.exists=This name already exists. Please choose another.
sebserver.form.validation.fieldError.exists=This name already exists. Please choose another one.
sebserver.form.validation.fieldError.email=Invalid mail address
sebserver.error.unexpected=Unexpected Error
sebserver.page.message=Information
sebserver.dialog.confirm.title=Confirmation
sebserver.dialog.confirm.deactivation=Note that there are {0} other entities that belongs to this entity.<br/>Those will also be deactivated by deactivating this entity.<br/><br/>Are You sure to deactivate this entity?
sebserver.dialog.confirm.deactivation.noDependencies=Are You sure to deactivate?
sebserver.dialog.confirm.deactivation.noDependencies=Are You sure you want to deactivate?
################################
# Login Page
@ -88,12 +88,12 @@ sebserver.dialog.confirm.deactivation.noDependencies=Are You sure to deactivate?
sebserver.login.username=User Name
sebserver.login.pwd=Password
sebserver.login.login=Sign In
sebserver.login.failed.title=Login Failed
sebserver.login.failed.message=Access Denied: Wrong username or password
sebserver.login.failed.title=Login failed
sebserver.login.failed.message=Access denied: wrong username or password
sebserver.logout=Sign out
sebserver.logout.success.message=You have been successfully signed out.
sebserver.login.password.change=Information
sebserver.login.password.change.success=Password successfully changed. Please sign in with your new password
sebserver.login.password.change.success=The password was successfully changed. Please sign in with your new password
################################
# Main Page
@ -102,7 +102,7 @@ sebserver.login.password.change.success=Password successfully changed. Please si
sebserver.logout=Logout
sebserver.mainpage.maximize.tooltip=Maximize
sebserver.mainpage.minimize.tooltip=Minimize
sebserver.activitiespane.title=Activities
sebserver.activitiespane.title=Administration
sebserver.actionpane.title=Actions
################################
@ -110,7 +110,7 @@ sebserver.actionpane.title=Actions
################################
sebserver.institution.list.actions=Selected Institution
sebserver.institution.list.empty=No Institution has been found. Please adapt the filter or create a new Institution
sebserver.institution.list.empty=No institution has been found. Please adapt the filter or create a new institution
sebserver.institution.list.title=Institutions
sebserver.institution.list.column.name=Name
sebserver.institution.list.column.urlSuffix=URL Suffix
@ -118,7 +118,7 @@ sebserver.institution.list.column.active=Status
sebserver.institution.action.list=Institution
sebserver.institution.action.form=Institution
sebserver.institution.action.new=New Institution
sebserver.institution.action.new=Add Institution
sebserver.institution.action.list.view=View Institution
sebserver.institution.action.list.modify=Edit Institution
sebserver.institution.action.modify=Edit
@ -127,8 +127,8 @@ sebserver.institution.action.activate=Activate Institution
sebserver.institution.action.deactivate=Deactivate Institution
sebserver.institution.action.delete=Delete Institution
sebserver.institution.info.pleaseSelect=Please Select an Institution first.
sebserver.institution.form.title.new=New Institution
sebserver.institution.info.pleaseSelect=Please select an institution first.
sebserver.institution.form.title.new=Add Institution
sebserver.institution.form.title=Institution
sebserver.institution.form.name=Name
@ -147,7 +147,7 @@ sebserver.useraccount.role.INSTITUTIONAL_ADMIN=Institutional Administrator
sebserver.useraccount.role.EXAM_ADMIN=Exam Administrator
sebserver.useraccount.role.EXAM_SUPPORTER=Exam Supporter
sebserver.useraccount.list.empty=No User Account has been found. Please adapt the filter or create a new User Account
sebserver.useraccount.list.empty=No user account has been found. Please adapt the filter or create a new user account
sebserver.useraccount.list.title=User Accounts
sebserver.useraccount.list.column.institution=Institution
sebserver.useraccount.list.column.name=Name
@ -158,7 +158,7 @@ sebserver.useraccount.list.column.active=Active
sebserver.useraccount.action.list=User Account
sebserver.useraccount.action.form=User Account of {0}
sebserver.useraccount.action.new=New User Account
sebserver.useraccount.action.new=Add User Account
sebserver.useraccount.action.view=View User Account
sebserver.useraccount.action.list.modify=Edit User Account
sebserver.useraccount.action.modify=Edit
@ -173,7 +173,7 @@ sebserver.useraccount.info.pleaseSelect=Please Select a User Account first.
sebserver.useraccount.info.notEditable=You have no edit rights for this User Account.
sebserver.useraccount.form.title=User Account
sebserver.useraccount.form.title.new=New User Account
sebserver.useraccount.form.title.new=Add User Account
sebserver.useraccount.form.institution=Institution
sebserver.useraccount.form.name=Name
sebserver.useraccount.form.username=Username
@ -206,10 +206,9 @@ sebserver.lmssetup.list.column.name=Name
sebserver.lmssetup.list.column.type=LMS Type
sebserver.lmssetup.list.column.active=Active
sebserver.lmssetup.action.list=LMS Setup
sebserver.lmssetup.action.form=LMS Setup
sebserver.lmssetup.action.new=New LMS Setup
sebserver.lmssetup.action.new=Add LMS Setup
sebserver.lmssetup.action.list.view=View LMS Setup
sebserver.lmssetup.action.list.modify=Edit LMS Setup
sebserver.lmssetup.action.modify=Edit
@ -228,7 +227,7 @@ sebserver.lmssetup.action.delete=Delete LMS Setup
sebserver.lmssetup.info.pleaseSelect=Please Select a LMS Setup first
sebserver.lmssetup.form.title=Learning Management System Setup
sebserver.lmssetup.form.title.new=New Learning Management System Setup
sebserver.lmssetup.form.title.new=Add Learning Management System Setup
sebserver.lmssetup.form.institution=Institution
sebserver.lmssetup.form.name=Name
sebserver.lmssetup.form.type=Type
@ -245,7 +244,7 @@ sebserver.lmssetup.form.secret.lms=LMS Server Password
sebserver.quizdiscovery.list.actions=Selected Quiz
sebserver.quizdiscovery.list.title=Quizzes
sebserver.quizdiscovery.list.empty=No Quizzes has been found. Please adapt the filter or create a new LMS Setup
sebserver.quizdiscovery.list.empty=No Quiz has been found. Please adapt the filter or create a new LMS Setup
sebserver.quizdiscovery.list.column.institution=Institution
sebserver.quizdiscovery.list.column.lmssetup=LMS
sebserver.quizdiscovery.list.column.name=Name
@ -279,7 +278,7 @@ sebserver.exam.list.column.name=Name
sebserver.exam.list.column.starttime=Start Time {0}
sebserver.exam.list.column.type=Type
sebserver.exam.list.empty=No Exams has been found. Please adapt the filter or import one from Quiz
sebserver.exam.list.empty=No Exam has been found. Please adapt the filter or import one from Quiz
sebserver.exam.list.modify.out.dated=Finished exams cannot be modified.
sebserver.exam.list.action.no.modify.privilege=No Access: An Exam from other institution cannot be modified.
@ -294,7 +293,7 @@ sebserver.exam.action.deactivate=Deactivate Exam
sebserver.exam.info.pleaseSelect=Please Select an Exam first
sebserver.exam.form.title.import=New Exam
sebserver.exam.form.title.import=Import Exam
sebserver.exam.form.title=Exam
sebserver.exam.form.lmssetup=LMS Setup
sebserver.exam.form.quizid=Quiz Identifier
@ -309,7 +308,7 @@ sebserver.exam.form.supporter.action.add=Add as supporter for this exam
sebserver.exam.form.supporter.action.remove=Remove supporter
sebserver.exam.type.UNDEFINED=Not Defined
sebserver.exam.type.MANAGED=Managed
sebserver.exam.type.MANAGED=Managed Devices
sebserver.exam.type.BYOD=Bring Your Own Device
sebserver.exam.type.VDI=VDI (Virtual Desktop Infrastructure)
@ -346,21 +345,21 @@ sebserver.exam.indicator.list.title=Indicators
sebserver.exam.indicator.list.column.type=Type
sebserver.exam.indicator.list.column.name=Name
sebserver.exam.indicator.list.column.thresholds=Thresholds
sebserver.exam.indicator.list.empty=There is currently no Indicator defined for this Exam. Please create a new one
sebserver.exam.indicator.list.pleaseSelect=Please Select an Indicator first
sebserver.exam.indicator.list.empty=There is currently no indicator defined for this exam. Please create a new one
sebserver.exam.indicator.list.pleaseSelect=Please select an indicator first
sebserver.exam.indicator.type.LAST_PING=Last Ping
sebserver.exam.indicator.type.ERROR_COUNT=Error Count
sebserver.exam.indicator.info.pleaseSelect=Please Select an Indicator first
sebserver.exam.indicator.info.pleaseSelect=Please select an indicator first
sebserver.exam.indicator.action.list.new=New
sebserver.exam.indicator.action.list.new=New
sebserver.exam.indicator.action.list.modify=Edit Selected
sebserver.exam.indicator.action.list.delete=Delete Selected
sebserver.exam.indicator.action.save=Save
sebserver.exam.indicator.form.title=Indicator
sebserver.exam.indicator.form.title.new=New Indicator
sebserver.exam.indicator.form.title.new=Add Indicator
sebserver.exam.indicator.form.exam=Exam
sebserver.exam.indicator.form.name=Name
sebserver.exam.indicator.form.type=Type
@ -372,7 +371,7 @@ sebserver.exam.indicator.thresholds.select.color=Please select a color
sebserver.exam.indicator.thresholds.list.title=Thresholds
sebserver.exam.indicator.thresholds.list.value=Value
sebserver.exam.indicator.thresholds.list.color=Color
sebserver.exam.indicator.thresholds.list.add=New Threshold
sebserver.exam.indicator.thresholds.list.add=Add Threshold
sebserver.exam.indicator.thresholds.list.remove=Delete Threshold
################################
@ -394,7 +393,7 @@ sebserver.clientconfig.list.column.active=Active
sebserver.clientconfig.info.pleaseSelect=Please Select a client configuration first
sebserver.clientconfig.list.action.no.modify.privilege=No Access: A SEB Client Configuration from other institution cannot be modified.
sebserver.clientconfig.form.title.new=New Client Configuration
sebserver.clientconfig.form.title.new=Add Client Configuration
sebserver.clientconfig.form.title=SEB Client Configuration
sebserver.clientconfig.form.name=Name
sebserver.clientconfig.form.fallback-url=Fallback Start URL
@ -402,7 +401,7 @@ sebserver.clientconfig.form.date=Creation Date
sebserver.clientconfig.form.encryptSecret=Configuration Password
sebserver.clientconfig.form.encryptSecret.confirm=Confirm Password
sebserver.clientconfig.action.list.new=New Configuration
sebserver.clientconfig.action.list.new=Add Configuration
sebserver.clientconfig.action.list.view=View Configuration
sebserver.clientconfig.action.list.modify=Edit Configuration
sebserver.clientconfig.action.modify=Edit
@ -427,7 +426,7 @@ sebserver.examconfig.list.empty=There is currently no SEB-Exam configuration ava
sebserver.examconfig.info.pleaseSelect=Please Select an exam configuration first
sebserver.examconfig.list.action.no.modify.privilege=No Access: An Exam Configuration from other institution cannot be modified.
sebserver.examconfig.action.list.new=New Exam Configuration
sebserver.examconfig.action.list.new=Add Exam Configuration
sebserver.examconfig.action.list.view=View Configuration
sebserver.examconfig.action.list.modify=Edit Settings
sebserver.examconfig.action.list.modify.properties=Edit Configuration
@ -442,7 +441,7 @@ sebserver.examconfig.action.undo.success=Successfully reverted to last saved sta
sebserver.examconfig.action.export.plainxml=Export XML
sebserver.examconfig.action.get-config-key=Export Config-Key
sebserver.examconfig.form.title.new=New Exam Configuration
sebserver.examconfig.form.title.new=Add Exam Configuration
sebserver.examconfig.form.title=Exam Configuration
sebserver.examconfig.form.name=Name
sebserver.examconfig.form.description=Description

1
src/main/resources/messages_en.properties
View file

@ -87,7 +87,6 @@ sebserver.institution.action.save=Save Institution
sebserver.institution.action.activate=Activate Institution
sebserver.institution.action.deactivate=Deactivate Institution
sebserver.institution.action.delete=Delete Institution
sebserver.institution.action.export.sebconfig=SEB Client Config
sebserver.institution.info.pleaseSelect=Please select an institution first.
sebserver.institution.form.title.new=Add Institution