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

Dockerfile

@@ -1,15 +1,18 @@
-FROM ubuntu:14.10
+FROM ubuntu:18.04
+
+ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y build-essential unzip curl python-pip python-dev python-matplotlib python-lxml \
 	python-numpy python-dateutil python-gdal python-yaml python-serial python-xlwt python-shapely python-pil python-gdal \
-	python-reportlab python-reportlab-accel python-tweepy python-xlrd python-pyth python-boto ansible 
+	python-reportlab python-reportlab-accel python-tweepy python-xlrd python-pyth python-boto ansible \
+	&& rm -rf /var/lib/apt/lists/*
 
 RUN pip install selenium\>=2.23.0 sunburnt\>=0.6 TwitterSearch\>=1.0 requests\>=2.3.0
 
 RUN curl -o web2py.zip https://codeload.github.com/web2py/web2py/zip/R-2.9.11 && unzip web2py.zip && mv web2py-R-2.9.11 /home/web2py && rm web2py.zip
 
-ADD . /home/web2py/applications/eden
+COPY . /home/web2py/applications/eden
 
-RUN cp /home/web2py/applications/eden/private/templates/000_config.py /home/web2py/applications/eden/models/000_config.py && sed -i 's|EDITING_CONFIG_FILE = False|EDITING_CONFIG_FILE = True|' /home/web2py/applications/eden/models/000_config.py
+RUN cp /home/web2py/applications/eden/modules/templates/000_config.py /home/web2py/applications/eden/models/000_config.py && sed -i 's|EDITING_CONFIG_FILE = False|EDITING_CONFIG_FILE = True|' /home/web2py/applications/eden/models/000_config.py
 
 CMD python /home/web2py/web2py.py -i 0.0.0.0 -p 8000 -a eden 

controllers/default.py

@@ -1089,11 +1089,11 @@ def prep(r):
                 title_update = T("Personal Profile"))
 
             # Organisation-dependent Fields
-            set_org_dependent_field = settings.set_org_dependent_field
-            set_org_dependent_field("pr_person_details", "father_name")
-            set_org_dependent_field("pr_person_details", "mother_name")
-            set_org_dependent_field("pr_person_details", "affiliations")
-            set_org_dependent_field("pr_person_details", "company")
+            #set_org_dependent_field = settings.set_org_dependent_field
+            #set_org_dependent_field("pr_person_details", "father_name")
+            #set_org_dependent_field("pr_person_details", "mother_name")
+            #set_org_dependent_field("pr_person_details", "affiliations")
+            #set_org_dependent_field("pr_person_details", "company")
 
             if r.component:
                 if r.component_name == "physical_description":

languages/de.py

@@ -1709,6 +1709,8 @@
 'Distance from %s:': 'Abstand von %s:',
 'Distance(Kms)': 'Distanz (km)',
 'Distributed without Record': 'Verteilt ohne Aufzeichnung',
+'Distribution Center': 'Verteilungszentrum',
+'Distribution center no longer active': 'Verteilungszentrum nicht mehr aktiv',
 'Distribution groups': 'Verteilergruppen',
 'Distribution of Clients': 'Verteilung der Klienten',
 'Distribution': 'Verteilung',
@@ -3728,6 +3730,7 @@
 'No skills currently set': 'Zurzeit sind keine Fähigkeiten festgelegt',
 'No staff or volunteers currently registered': 'Zurzeit sind weder Mitarbeiter noch Freiwillige registriert',
 'No status information available': 'Keine Statusinformation verfügbar',
+'No suitable distribution center found': 'Kein passendes Verteilungszentrum gefunden',
 'No synchronization': 'Keine Synchronisation',
 'No tasks currently registered': 'Zurzeit sind keine Aufgaben registriert',
 'No template found!': 'Keine Vorlage gefunden!',
@@ -4572,6 +4575,7 @@
 'Requested': 'Angefragt',
 'Requester': 'Anfragender',
 'Requesting Organisation': 'Anfragende Organisation',
+'Requesting site no longer active': 'Bestellende Stelle nicht mehr aktiv',
 'Requests Management': 'Anfragenverwaltung',
 'Requests Report': 'Statistik Bestellungen',
 'Requests': 'Anfragen',

modules/s3/codecs/xls.py

@@ -190,13 +190,14 @@ def encode(self, resource, **attr):
         COL_WIDTH_MULTIPLIER = self.COL_WIDTH_MULTIPLIER
 
         # Get the attributes
-        title = attr.get("title")
+        attr_get = attr.get
+        title = attr_get("title")
         if title is None:
             title = current.T("Report")
-        list_fields = attr.get("list_fields")
-        group = attr.get("dt_group")
-        use_colour = attr.get("use_colour", False)
-        evenodd = attr.get("evenodd", True)
+        list_fields = attr_get("list_fields")
+        group = attr_get("dt_group")
+        use_colour = attr_get("use_colour", False)
+        evenodd = attr_get("evenodd", True)
 
         # Extract the data from the resource
         if isinstance(resource, dict):
@@ -517,7 +518,7 @@ def get_current_row(row_count, row_limit):
         book.save(output)
         output.seek(0)
 
-        if attr.get("as_stream", False):
+        if attr_get("as_stream", False):
             return output
 
         # Response headers

modules/s3/s3report.py

@@ -372,13 +372,13 @@ def geojson(self, r, **attr):
 
                 # Export as GeoJSON
                 current.xml.show_ids = True
-                output = resource.export_xml(fields=include,
-                                             mcomponents=None,
-                                             references=[],
-                                             stylesheet=stylesheet,
-                                             as_json=True,
-                                             location_data=location_data,
-                                             map_data=dict(style=style),
+                output = resource.export_xml(fields = include,
+                                             mcomponents = None,
+                                             references = [],
+                                             stylesheet = stylesheet,
+                                             as_json = True,
+                                             location_data = location_data,
+                                             map_data = {"style": style},
                                              )
                 # Transformation error?
                 if not output:
@@ -444,17 +444,18 @@ def geojson(self, r, **attr):
             # Export as GeoJSON
             current.xml.show_ids = True
             gresource = current.s3db.resource("gis_location", id=ids)
-            output = gresource.export_xml(fields=[],
-                                          mcomponents=None,
-                                          references=[],
-                                          stylesheet=stylesheet,
-                                          as_json=True,
-                                          location_data=location_data,
+            output = gresource.export_xml(fields = [],
+                                          mcomponents = None,
+                                          references = [],
+                                          stylesheet = stylesheet,
+                                          as_json = True,
+                                          location_data = location_data,
                                           # Tell the client that we are
                                           # displaying aggregated data and
                                           # the level it is aggregated at
-                                          map_data=dict(level=int(level[1:]),
-                                                        style=style),
+                                          map_data = {"level": int(level[1:]),
+                                                      "style": style,
+                                                      },
                                           )
             # Transformation error?
             if not output:

modules/s3/s3resource.py

@@ -1097,6 +1097,9 @@ def load(self,
             else:
                 meta_fields = s3.all_meta_fields = s3_all_meta_field_names()
             s3db = current.s3db
+            superkeys = s3db.get_super_keys(table)
+        else:
+            meta_fields = superkeys = None
 
         # Field selection
         qfields = ([table._id.name, UID])
@@ -1136,12 +1139,9 @@ def load(self,
                     continue
 
                 # Must include all super-keys
-                ktablename = s3_get_foreign_key(table[f], m2m=False)[0]
-                if ktablename:
-                    ktable = s3db.table(ktablename)
-                    if ktable and hasattr(ktable, "instance_type"):
-                        append(f)
-                        continue
+                if f in superkeys:
+                    append(f)
+                    continue
 
             if f in skip:
                 continue

modules/s3db/inv.py

@@ -2590,8 +2590,7 @@ def inv_send_process():
                      }
         recv_id = rtable.insert(**recv_item)
         recv_item["id"] = recv_id
-        realm_entity = auth.get_realm_entity(rtable, recv_item)
-        db(rtable.id == recv_id).update(realm_entity = realm_entity)
+        auth.s3_set_record_owner(rtable, recv_id)
 
         # Change the status for all track items in this shipment to In transit
         # and link to the receive record

modules/s3db/org.py

@@ -5636,7 +5636,7 @@ def custom_lookup_rows(self, key, values, fields=None):
         rows = db(query).select(limitby=limitby, *fields)
         self.queries += 1
 
-        if show_type:
+        if show_type or show_link:
 
             # Collect the site_ids
             site_ids = set(row.site_id for row in rows)
@@ -5665,7 +5665,8 @@ def custom_lookup_rows(self, key, values, fields=None):
 
             # Bulk-represent all type IDs
             # (stores the representations in the S3Represent)
-            ltable.facility_type_id.represent.bulk(list(all_types))
+            if show_type:
+                ltable.facility_type_id.represent.bulk(list(all_types))
 
             # Add the list of corresponding type IDs to each row
             for row in rows:

modules/templates/CumbriaEAC/Demo/organisation.csv

@@ -1,2 +1,3 @@
 Organisation,Type,Country,L1,L2,L3,L4
-Cumbria Police,,GB,England,Cumbria,,
+Cumbria Police,,GB,England,Cumbria,,
+Cumbria County Council,,GB,England,Cumbria,,

modules/templates/CumbriaEAC/Demo/tasks.cfg

@@ -15,6 +15,6 @@
 #     s3import::S3BulkImporter
 # =============================================================================
 org,organisation,organisation.csv,organisation.xsl
-cr,shelter,cr_shelter.csv,shelter.xsl
+#cr,shelter,cr_shelter.csv,shelter.xsl
 *,import_user,users.csv
 # =============================================================================

modules/templates/CumbriaEAC/Demo/users.csv

@@ -1,2 +1,3 @@
 First Name,Last Name,Email,Password,Role,Organisation,Link
 Police,Emergency Room,police@example.com,eden,,Cumbria Police,staff
+Cumbria,County Council,ccc@example.com,eden,,Cumbria County Council,staff

modules/templates/CumbriaEAC/auth_roles.csv

@@ -0,0 +1,19 @@
+uid,role,description,controller,function,table,uacl,oacl,entity,Notes
+ANONYMOUS,Anonymous,,,,org_organisation,READ,,,Required for 'existing' self-registration
+AUTHENTICATED,Authenticated,,gis,,,READ,,,
+AUTHENTICATED,Authenticated,,cr,,,CREATE|READ|UPDATE,,,
+AUTHENTICATED,Authenticated,,,,cr_shelter,CREATE|READ|UPDATE,,,
+AUTHENTICATED,Authenticated,,hrm,person,,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,hrm,human_resource,,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,hrm,staff,,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,,,hrm_human_resource,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,org,organisation,,CREATE|READ,,,
+AUTHENTICATED,Authenticated,,,,org_organisation,CREATE|READ,,,
+AUTHENTICATED,Authenticated,,,,org_organisation_organisation_type,CREATE|READ,,,
+AUTHENTICATED,Authenticated,,pr,contact,,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,pr,contact_emergency,,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,pr,person,,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,,,pr_address,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,,,pr_contact,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,,,pr_contact_emergency,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,
+AUTHENTICATED,Authenticated,,,,pr_person,CREATE|READ|UPDATE,READ|UPDATE|DELETE,,