Merge branch 'master' of github.com:nursix/eden

sahana · Apr 10, 2019 · 3c7beb2 · 3c7beb2
2 parents 163648f + 83bf411
commit 3c7beb2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/languages/de.py b/languages/de.py
@@ -525,6 +525,7 @@
 'Assigned': 'Zugeordnet',
 'Assistance Statuses': 'Maßnahmenstatus',
 'Assistance Types': 'Maßnahmenarten',
+'Assistance': 'Hilfestellung',
 'Assume this event type if no type was specified for an event': 'Diesen Ereignistyp annehmen wenn für ein Ereignis kein Typ angegeben wurde',
 'Asylum Application': 'Asylantrag',
 'Asylum Process': 'Asylverfahren',
@@ -656,6 +657,7 @@
 'Bridge Closed': 'Brücke ist geschlossen',
 'British Indian Ocean Territory': 'Britisches Territorium im Indischen Ozean',
 'British Virgin Islands': 'Britische Jungferninseln',
+'Brokering/Liaison': 'Vermittlung/Liaison',
 'Bucket': 'Eimer',
 'Budget Details': 'Details zum Budget',
 'Budget Updated': 'Budget aktualisiert',
@@ -988,6 +990,7 @@
 'Constraints Only': 'Nur Bedingungen',
 'Consultant in charge': 'Zuständiger Berater',
 'Consultant': 'Berater',
+'Consultation': 'Beratung',
 'Consumable': 'Verbrauchsartikel',
 'Contact Data': 'Kontakt Daten',
 'Contact Description': 'Kontaktbeschreibung',
@@ -1190,6 +1193,7 @@
 'Credentials': 'Qualifikationen',
 'Credit Card': 'Kreditkarte',
 'Crime': 'Kriminalität',
+'Crisis Intervention': 'Krisenintervention',
 'Criteria': 'Kriterien',
 'Croatia': 'Kroatien',
 'Crop Image': 'Bild beschneiden',
@@ -1823,6 +1827,7 @@
 'Error encountered while applying the theme.': 'Bei der Anwendung des Themas ist ein Fehler aufgetreten.',
 'Error in message': 'Fehler in der Nachricht',
 'Errors': 'Fehler',
+'Escort': 'Begleitung',
 'Essential Staff': 'Unverzichtbarer Mitarbeiter',
 'Essential Staff?': 'Unverzichtbarer Mitarbeiter?',
 'Est. Delivery Date': 'Geschätztes Lieferdatum',
@@ -2452,6 +2457,7 @@
 'Inventory Management': 'Lagerbestandsverwaltung',
 'Inventory of Effects': 'Bestand von Vermögenswerten',
 'Inventory': 'Bestand',
+'Investigation': 'Nachforschung',
 'Iran (Islamic Republic of)': 'Iran (Islamische Republik von)',
 'Iraq': 'Irak',
 'Ireland': 'Irland',
@@ -5078,6 +5084,7 @@
 'Transition Effect': 'Übergangseffekt',
 'Transitory Accommodation': 'Durchgangsunterkunft',
 'Translation': 'Übersetzung',
+'Transport': 'Transport',
 'Transportation assistance, Rank': 'Transport-Unterstützung, Rank',
 'Trauma Center': 'Trauma Zentrum',
 'Travel Cost': 'Reisekosten',

diff --git a/modules/s3/s3roles.py b/modules/s3/s3roles.py
@@ -381,8 +381,9 @@ def role_form(self, r, **attr):
                             label = PERMISSIONS,
                             widget = S3PermissionWidget(r.id),
                             )
-        if not current.auth.permission.use_cacls:
-            # Security policy with fixed access rules
+        if readonly or not current.auth.permission.use_cacls:
+            # Cannot edit permissions in read-view, nor with a
+            # security policy with fixed access rules
             permissions.readable = permissions.writable = False
         elif record:
             if record.uuid == "ADMIN":

diff --git a/modules/templates/BRCMS/Caritas/Demo/users.csv b/modules/templates/BRCMS/Caritas/Demo/users.csv
@@ -1,4 +1,4 @@
 First Name,Last Name,Email,Password,Role,Organisation,Language
-Caritas,Case Manager,[email protected],eden,CASE_MANAGEMENT,Caritas,de
-Caritas,OrgAdmin,[email protected],eden,ORG_ADMIN,Caritas,de
-Caritas,OrgGroupAdmin,[email protected],eden,ORG_GROUP_ADMIN/0,Caritas,de
+Caritas,Case Manager,[email protected],eden,"CASE_MANAGEMENT,STAFF",Caritas,de
+Caritas,OrgAdmin,[email protected],eden,"ORG_ADMIN,STAFF",Caritas,de
+Caritas,OrgGroupAdmin,[email protected],eden,"ORG_GROUP_ADMIN/0,STAFF",Caritas,de
diff --git a/modules/templates/BRCMS/Demo/users.csv b/modules/templates/BRCMS/Demo/users.csv
@@ -1,4 +1,4 @@
 First Name,Last Name,Email,Password,Role,Organisation,Language
-Example,Case Manager,[email protected],eden,CASE_MANAGEMENT,Example Organisation,en
-Example,OrgAdmin,[email protected],eden,ORG_ADMIN,Example Organisation,en
-Example,OrgGroupAdmin,[email protected],eden,ORG_GROUP_ADMIN/0,Example Organisation,en
+Example,Case Manager,[email protected],eden,"CASE_MANAGEMENT,STAFF",Example Organisation,en
+Example,OrgAdmin,[email protected],eden,"ORG_ADMIN,STAFF",Example Organisation,en
+Example,OrgGroupAdmin,[email protected],eden,"ORG_GROUP_ADMIN/0,STAFF",Example Organisation,en
diff --git a/static/scripts/S3/s3.ui.permissions.js b/static/scripts/S3/s3.ui.permissions.js
@@ -212,7 +212,7 @@
                 }
             });
             if (ruleSet._other.length) {
-                this._ruleTable('p', null, ruleSet._other).appendTo(tab);
+                this._ruleTable('p', '_other', ruleSet._other).appendTo(tab);
             }
 
             // Render table rules
@@ -231,7 +231,7 @@
                 this._ruleTable('t', '_system', ruleSet._system).appendTo(tab);
 
                 if (ruleSet._other.length) {
-                    this._ruleTable('t', null, ruleSet._other).appendTo(tab);
+                    this._ruleTable('t', '_other', ruleSet._other).appendTo(tab);
                 }
             }
 

diff --git a/static/scripts/S3/s3.ui.permissions.min.js b/static/scripts/S3/s3.ui.permissions.min.js