Skip to content

Commit ab78930

Browse files
ref #1118 done
1 parent b8ec3d1 commit ab78930

File tree

8 files changed

+361
-8
lines changed

8 files changed

+361
-8
lines changed

DisplayObjects/mobile/assets/i18n/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version_c8o": "2.1.8-beta3",
2+
"version_c8o": "2.1.8-beta4",
33
"deleted_element": "Deleted element",
44
"copy_link_no_auth": "Copy link without authentication",
55
"to_the_app": "to the app",

DisplayObjects/mobile/assets/i18n/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version_c8o": "2.1.8-beta3",
2+
"version_c8o": "2.1.8-beta4",
33
"deleted_element": "Elemento eliminado",
44
"copy_link_no_auth": "Copiar enlace sin autenticación",
55
"to_the_app": "a la aplicación",

DisplayObjects/mobile/assets/i18n/fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version_c8o": "2.1.8-beta3",
2+
"version_c8o": "2.1.8-beta4",
33
"deleted_element": "Élément supprimé",
44
"copy_link_no_auth": "Copier le lien sans authentification",
55
"to_the_app": "à l'application",

DisplayObjects/mobile/assets/i18n/it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version_c8o": "2.1.8-beta3",
2+
"version_c8o": "2.1.8-beta4",
33
"deleted_element": "Elemento eliminato",
44
"copy_link_no_auth": "Copia il link senza autenticazione",
55
"to_the_app": "all'app",

_c8oProject/mobilePages/ManageAccessRights.yaml

Lines changed: 316 additions & 2 deletions
Large diffs are not rendered by default.

_c8oProject/sequences/APIV2_GetManageAccessRights.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,43 @@ comment: |
77
'// Imports and helpers functions
88
include("js/common.js");
99
let logLevel = "warn";
10+
var computeSortLabel = function(entry) {
11+
if (!entry) {
12+
return "";
13+
}
14+
var label = "";
15+
if (entry.display !== undefined && entry.display !== null && entry.display !== "") {
16+
label = entry.display;
17+
}
18+
else if (entry.displayName !== undefined && entry.displayName !== null && entry.displayName !== "") {
19+
label = entry.displayName;
20+
}
21+
else if (entry.displayMail !== undefined && entry.displayMail !== null && entry.displayMail !== "") {
22+
label = entry.displayMail;
23+
}
24+
else if (entry.value !== undefined && entry.value !== null) {
25+
label = entry.value;
26+
}
27+
return ("" + label).toLocaleLowerCase();
28+
};
29+
var sortEntries = function(list) {
30+
if (!isArray(list)) {
31+
return list;
32+
}
33+
var copy = list.slice();
34+
copy.sort(function(a, b) {
35+
var aLabel = computeSortLabel(a);
36+
var bLabel = computeSortLabel(b);
37+
if (aLabel < bLabel) {
38+
return -1;
39+
}
40+
if (aLabel > bLabel) {
41+
return 1;
42+
}
43+
return 0;
44+
});
45+
return copy;
46+
};
1047
1148
// ensure params are ok ....
1249
if (collab == "true") {
@@ -211,6 +248,8 @@ comment: |
211248
return true;
212249
}
213250
});
251+
res.grpsOrUsers = sortEntries(res.grpsOrUsers);
252+
existingGrpsOrUsersArrayFormated = sortEntries(existingGrpsOrUsersArrayFormated);
214253
//res.existingGrpsOrUsersArray = existingGrpsOrUsersArray;
215254
res.existingGrpsOrUsersArrayFormated = existingGrpsOrUsersArrayFormated;
216255
if(collab == false){

c8oProject.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
contextTimeout: ${C8Oforms.context.timeout=60}
55
corsOrigin: =Origin
66
httpSessionTimeout: ${C8Oforms.http_session.timeout=60}
7-
version: 2.1.8-beta3
7+
version: 2.1.8-beta4
88
↓c8oforms_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_fs.yaml
99
↓c8oforms_response_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_response_fs.yaml
1010
↓AddUser [sequences.GenericSequence]: 🗏 sequences/AddUser.yaml

ngswForPWA/ngsw-config-sub-pwa.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"appData": {
55
"name": "Convertigo Forms Builder",
66
"description": "A simple and intuitive \"no code\" tool to create your personalized apps in a few clicks!",
7-
"version": "2.1.8-beta3"
7+
"version": "2.1.8-beta4"
88
},
99
"assetGroups": [
1010
{

0 commit comments

Comments
 (0)