E2e fixes

db/changes/231601/00-userAcl.sql

@@ -3,10 +3,17 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
         ('VnUser', '*', '*', 'ALLOW', 'ROLE', 'employee'),
         ('VnUser','acl','READ','ALLOW','ROLE','account'),
         ('VnUser','getCurrentUserData','READ','ALLOW','ROLE','account'),
-        ('VnUser','changePassword', 'WRITE', 'ALLOW', 'ROLE', 'account');
+        ('VnUser','changePassword', 'WRITE', 'ALLOW', 'ROLE', 'account'),
+        ('Account','exists','READ','ALLOW','ROLE','account');
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('Account','exists','READ','ALLOW','ROLE','account');
 
 DELETE FROM `salix`.`ACL` WHERE (model, property) = ('Account', 'acl');
 DELETE FROM `salix`.`ACL` WHERE (model, property) = ('Account', 'getCurrentUserData');
+DELETE FROM `salix`.`ACL` WHERE (model, property) = ('Account', 'changePassword');
+DELETE FROM `salix`.`ACL` WHERE model = 'UserAccount';
 
 UPDATE `hedera`.`imageCollection` t
 SET t.model = 'VnUser'

e2e/paths/14-account/04_acl.spec.js

@@ -23,7 +23,7 @@ describe('Account ACL path', () => {
 
     it('should create new acl', async() => {
         await page.autocompleteSearch(selectors.accountAcl.role, 'sysadmin');
-        await page.autocompleteSearch(selectors.accountAcl.model, 'UserAccount');
+        await page.autocompleteSearch(selectors.accountAcl.model, 'Account');
         await page.autocompleteSearch(selectors.accountAcl.accessType, '*');
         await page.autocompleteSearch(selectors.accountAcl.permission, 'ALLOW');
         await page.waitToClick(selectors.accountAcl.save);

modules/account/front/basic-data/index.html

@@ -14,25 +14,25 @@
             <vn-textfield
                 label="User" 
                 ng-model="$ctrl.user.name"
-                rule
+                rule="VnUser"
                 vn-focus>
             </vn-textfield>
             <vn-textfield
                 label="Nickname" 
                 ng-model="$ctrl.user.nickname"
-                rule>
+                rule="VnUser">
             </vn-textfield>
             <vn-textfield
                 label="Personal email" 
                 ng-model="$ctrl.user.email"
-                rule>
+                rule="VnUser">
             </vn-textfield>
             <vn-autocomplete
                 label="Language"
                 ng-model="$ctrl.user.lang"
                 url="Languages"
                 value-field="code"
-                rule>
+                rule="VnUser">
             </vn-autocomplete>
         </vn-vertical>
     </vn-card>

modules/account/front/create/index.html

@@ -14,24 +14,24 @@
             <vn-textfield
                 label="Name" 
                 ng-model="$ctrl.user.name"
-                rule
+                rule="VnUser"
                 vn-focus>
             </vn-textfield>
             <vn-textfield
                 label="Nickname" 
                 ng-model="$ctrl.user.nickname"
-                rule>
+                rule="VnUser">
             </vn-textfield>
             <vn-textfield
                 label="Email" 
                 ng-model="$ctrl.user.email"
-                rule>
+                rule="VnUser">
             </vn-textfield>
             <vn-autocomplete
                 label="Role"
                 ng-model="$ctrl.user.roleFk"
                 url="Roles"
-                rule>
+                rule="VnUser">
             </vn-autocomplete>
             <vn-textfield
                 label="Password"

modules/ticket/front/future/index.js

@@ -149,19 +149,9 @@ export default class Controller extends Section {
         case 'lines':
             return {'lines': value};
         case 'ipt':
-            return {or:
+            return {'ipt': {like: `%${value}%`}};
-                    [
-                        {'ipt': {like: `%${value}%`}},
-                        {'ipt': null}
-                    ]
-            };
         case 'futureIpt':
-            return {or:
+            return {'futureIpt': {like: `%${value}%`}};
-                    [
-                        {'futureIpt': {like: `%${value}%`}},
-                        {'futureIpt': null}
-                    ]
-            };
         }
     }
 }