Skip to content
Snippets Groups Projects
Commit 13f9f4e7 authored by Tom Lutzenberger's avatar Tom Lutzenberger
Browse files

#1058862: Improve validation and template after review

parent 9e7de951
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 215 additions and 94 deletions
entity/Usersettings_entity/Usersettings_entity.aod
+ 6
− 0
View file @ 13f9f4e7
......@@ -60,6 +60,11 @@
<name>jPasswordRepeat</name>
<title>Repeat password</title>
<contentType>PASSWORD</contentType>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
<onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js</onValidation>
</entityField>
<entityField>
......@@ -69,6 +74,7 @@
<name>currentPassword</name>
<title>Current password</title>
<contentType>PASSWORD</contentType>
<stateProcess>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js</onValidation>
</entityField>
</entityFields>
......
entity/Usersettings_entity/entityfields/currentpassword/onValidation.js
+ 6
− 2
View file @ 13f9f4e7
import("system.result");
import("system.neon");
import("system.translate");
import("system.tools");
import("system.vars");
......@@ -8,6 +9,9 @@ import("UserSettings_lib");
let login = UserSettingUtil.getValue("title");
let password = vars.get("$local.value");
if(password && !tools.verifyPassword(login, password)) {
result.string(translate.text("Wrong password"));
if(vars.get("$property.currentPassword.state") !== neon.COMPONENTSTATE_INVISIBLE) {
if(password && !tools.verifyPassword(login, password)) {
result.string(translate.text("Wrong password"));
}
}
entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js 0 → 100644
+ 11
− 0
View file @ 13f9f4e7
import("system.neon");
import("system.result");
import("system.tools");
import("UserSettings_lib");
let login = UserSettingUtil.getValue("title");
if(tools.verifyPassword(login, "")) {
result.string(neon.COMPONENTSTATE_INVISIBLE);
}
entity/Usersettings_entity/entityfields/jpassword/onValidation.js
+ 10
− 4
View file @ 13f9f4e7
import("system.neon");
import("system.result");
import("system.translate");
import("system.tools");
......@@ -10,14 +11,19 @@ let policyMessages = tools.validatePasswordPolicies(newPassword, vars.get("$sys.
let messages = [];
if(newPassword) {
if(newPassword === currentPassword) {
result.string(translate.text("New password must not be the same as the current password"));
if(vars.get("$property.currentPassword.state") !== neon.COMPONENTSTATE_INVISIBLE) {
if(!currentPassword) {
messages.push(translate.text("Enter current password to verify"));
} else if(newPassword === currentPassword) {
messages.push(translate.text("New password must not be the same as the current password"));
}
}
if(policyMessages.length > 0) {
for(let msg in policyMessages) {
messages.push(policyMessages[msg]);
}
result.string(messages.join("\n", messages));
}
result.string(messages.join("\n", messages));
}
entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js
+ 2
− 4
View file @ 13f9f4e7
......@@ -6,8 +6,6 @@ import("system.vars");
let passwordRepeat = vars.get("$local.value");
let newPassword = vars.get("$field.jPassword");
if(passwordRepeat) {
if(newPassword !== passwordRepeat) {
result.string(translate.text("Passwords do not match"));
}
if(newPassword !== passwordRepeat) {
result.string(translate.text("Passwords do not match"));
}
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 48
− 0
View file @ 13f9f4e7
......@@ -7149,6 +7149,54 @@
<entry>
<key>export using the selected template</key>
</entry>
<entry>
<key>Input value</key>
</entry>
<entry>
<key>Output value</key>
</entry>
<entry>
<key>Enddatum</key>
</entry>
<entry>
<key>Startdatum</key>
</entry>
<entry>
<key>Mapping</key>
</entry>
<entry>
<key>Typ</key>
</entry>
<entry>
<key>Mappings</key>
</entry>
<entry>
<key>Sort up</key>
</entry>
<entry>
<key>Titel</key>
</entry>
<entry>
<key>Set missing address locations</key>
</entry>
<entry>
<key>Sort down</key>
</entry>
<entry>
<key>FavoriteFilter_view</key>
</entry>
<entry>
<key>Set all address locations</key>
</entry>
<entry>
<key>Members</key>
</entry>
<entry>
<key>Gruppenname</key>
</entry>
<entry>
<key>Enter current password to verify</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 82
− 36
View file @ 13f9f4e7
......@@ -707,6 +707,9 @@
<key>None</key>
<value>Keine</value>
</entry>
<entry>
<key>Edit workflow</key>
</entry>
<entry>
<key>Date of request</key>
<value>Datum der Anforderung</value>
......@@ -8992,9 +8995,6 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Receive new Department Permission</key>
</entry>
<entry>
<key>Selection placeholder</key>
</entry>
<entry>
<key>Grant new Department Permission</key>
<value>Neue Abteilungs-Berechtigung vergeben</value>
......@@ -9004,56 +9004,76 @@ Bitte Datumseingabe prüfen</value>
<value>Aktuelles Passwort</value>
</entry>
<entry>
<key>Calendar maintime start</key>
<value>Kalender-Kernzeit Beginn</value>
<key>New password</key>
<value>Neues Passwort</value>
</entry>
<entry>
<key>favorties</key>
<key>Repeat password</key>
<value>Passwort wiederholen</value>
</entry>
<entry>
<key>Fantasy</key>
<key>Enter current password to verify</key>
<value>Aktuelles Passwort zur Verifizierung eingeben</value>
</entry>
<entry>
<key>Password must contain special characters</key>
<key>Selection placeholder</key>
<value>Suche Platzhalter</value>
</entry>
<entry>
<key>Longitude</key>
<key>SELECTION_POSTFIX</key>
<value>Hinten</value>
</entry>
<entry>
<key>Password must be at least %0 characters</key>
<key>SELECTION_PREFIX</key>
<value>Vorne</value>
</entry>
<entry>
<key>Permission Procurer Department</key>
<value>Rechteempfänger Abteilung</value>
<key>SELECTION_BOTH</key>
<value>Vorne und hinten</value>
</entry>
<entry>
<key>favorite</key>
<key>SELECTION_NEITHER</key>
<value>Berücksichtigen</value>
</entry>
<entry>
<key>Repeat password</key>
<value>Passwort wiederholen</value>
<key>SELECTION_NULL</key>
<value>Ignorieren</value>
</entry>
<entry>
<key>{SENT_MAIL}</key>
<key>Selection ignore case</key>
<value>Groß-/Kleinschreibung ignorieren</value>
</entry>
<entry>
<key>SELECTION_NULL</key>
<key>Calendar hour divider</key>
<value>Stundenunterteilung</value>
</entry>
<entry>
<key>Selection ignore case</key>
<key>Calendar maintime start</key>
<value>Kernzeit Beginn</value>
</entry>
<entry>
<key>Calendar maintime end</key>
<value>Kalender-Kernzeit Ende</value>
<value>Kernzeit Ende</value>
</entry>
<entry>
<key>Release</key>
<key>{SENT_MAIL}</key>
</entry>
<entry>
<key>SELECTION_NEITHER</key>
<key>favorties</key>
</entry>
<entry>
<key>Fantasy</key>
</entry>
<entry>
<key>Password must contain numbers</key>
<key>Permission Procurer Department</key>
<value>Rechteempfänger Abteilung</value>
</entry>
<entry>
<entry>
<key>favorite</key>
</entry>
<entry>
<key>Release</key>
</entry>
<entry>
<key>granted permission</key>
......@@ -9065,10 +9085,6 @@ Bitte Datumseingabe prüfen</value>
<key>Permission Procurer User</key>
<value>Rechteempfänger Benutzer</value>
</entry>
<entry>
<key>New password</key>
<value>Neues Passwort</value>
</entry>
<entry>
<key>and open Report</key>
</entry>
......@@ -9079,6 +9095,9 @@ Bitte Datumseingabe prüfen</value>
<key>Add Recipients</key>
<value>Teilnehmer hinzufügen</value>
</entry>
<entry>
<key>Grant new User Permission</key>
</entry>
<entry>
<key>{SEND_MAIL}</key>
</entry>
......@@ -9105,34 +9124,61 @@ Bitte Datumseingabe prüfen</value>
<value>Neue Abteilungs-Berechtigung vergeben</value>
</entry>
<entry>
<key>Password must contain spaces</key>
<key>favorites</key>
</entry>
<entry>
<key>favorites</key>
<key>Input value</key>
</entry>
<entry>
<key>The use of any of your previous %0 passwords is prohibited</key>
<key>Output value</key>
</entry>
<entry>
<key>Total in euros</key>
<key>Enddatum</key>
</entry>
<entry>
<key>Add Participants</key>
<key>Startdatum</key>
</entry>
<entry>
<key>Calendar hour divider</key>
<key>Mapping</key>
</entry>
<entry>
<key>SELECTION_BOTH</key>
<key>Typ</key>
</entry>
<entry>
<key>SELECTION_POSTFIX</key>
<key>Mappings</key>
</entry>
<entry>
<key>Password must contain letters</key>
<key>Sort up</key>
</entry>
<entry>
<key>SELECTION_PREFIX</key>
<key>Titel</key>
</entry>
<entry>
<key>Set missing address locations</key>
</entry>
<entry>
<key>Sort down</key>
</entry>
<entry>
<key>FavoriteFilter_view</key>
</entry>
<entry>
<key>Set all address locations</key>
</entry>
<entry>
<key>Members</key>
</entry>
<entry>
<key>Gruppenname</key>
</entry>
<entry>
<key>Total in euros</key>
</entry>
<entry>
<key>Add Participants</key>
</entry>
<entry>
<key>Add Recipients</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
......
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 48
− 0
View file @ 13f9f4e7
......@@ -7216,6 +7216,54 @@
<entry>
<key>export using the selected template</key>
</entry>
<entry>
<key>Input value</key>
</entry>
<entry>
<key>Output value</key>
</entry>
<entry>
<key>Enddatum</key>
</entry>
<entry>
<key>Startdatum</key>
</entry>
<entry>
<key>Mapping</key>
</entry>
<entry>
<key>Typ</key>
</entry>
<entry>
<key>Mappings</key>
</entry>
<entry>
<key>Sort up</key>
</entry>
<entry>
<key>Titel</key>
</entry>
<entry>
<key>Set missing address locations</key>
</entry>
<entry>
<key>Sort down</key>
</entry>
<entry>
<key>FavoriteFilter_view</key>
</entry>
<entry>
<key>Set all address locations</key>
</entry>
<entry>
<key>Members</key>
</entry>
<entry>
<key>Gruppenname</key>
</entry>
<entry>
<key>Enter current password to verify</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
+ 0
− 48
View file @ 13f9f4e7
......@@ -34,53 +34,5 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>SearchEdit</name>
<editMode v="true" />
<showDrawer v="true" />
<drawerCaption>Search</drawerCaption>
<fixedDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>d028eaa3-7250-4b9f-be94-4c097b426506</name>
<entityField>selectionIgnoreCase</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e632f409-891a-4c02-b077-962d40b657f9</name>
<entityField>selectionPlaceholder</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>CalendarEdit</name>
<editMode v="true" />
<showDrawer v="true" />
<drawerCaption>Calendar</drawerCaption>
<fixedDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>6c58b326-3fe6-4b1d-a6d4-1735861c419a</name>
<entityField>calMaintimeStart</entityField>
</entityFieldLink>
<entityFieldLink>
<name>1463dddd-efa6-4fff-bb7e-ee1bc190f077</name>
<entityField>calMaintimeEnd</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4bb63da1-6a83-4f68-8605-11dd43501b7b</name>
<entityField>calHourdivider</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>OtherSettings</name>
<editMode v="true" />
<showDrawer v="true" />
<drawerCaption>Others</drawerCaption>
<fixedDrawer v="true" />
<entityField>#ENTITY</entityField>
</genericViewTemplate>
</children>
</neonView>
process/UserSettings_lib/process.js
+ 2
− 0
View file @ 13f9f4e7
......@@ -19,11 +19,13 @@ function UserSettingUtil () {}
tools.PASSWORD,
];
let paramSettings = [
/*
"calHourdivider",
"calMaintimeEnd",
"calMaintimeStart",
"selectionIgnoreCase",
"selectionPlaceholder",
*/
];
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment