Expose service locations on tab in RW

VERSION

@@ -1 +1 @@
-nursix-1.1.0-devel-3072-gcd5da74 (2015-11-12 13:11:03)
+nursix-1.1.0-devel-3073-ge968f51 (2015-11-12 13:11:05)

modules/s3cfg.py

@@ -3163,6 +3163,12 @@ def get_org_services_hierarchical(self):
         """
         return self.org.get("services_hierarchical", False)
 
+    def get_org_service_locations(self):
+        """
+            Whether to expose the service locations tab for organisations
+        """
+        return self.__lazy("org", "service_locations", default=False)
+
     def get_org_site_code_len(self):
         """
             Length of auto-generated Codes for Facilities (org_site)

modules/s3db/org.py

@@ -675,6 +675,8 @@ def model(self):
                                       "key": "service_id",
                                       "actuate": "hide",
                                       },
+                       # Service Locations
+                       org_service_location = "organisation_id",
                        # Format for filter_widget
                        org_service_organisation = "organisation_id",
                        # Assets
@@ -2647,7 +2649,7 @@ def model(self):
                         "status",
                         "comments",
                         )
-                        
+
         # List fields
         list_fields = ["organisation_id",
                        "site_id",
@@ -2684,7 +2686,7 @@ def model(self):
                                                             "org_service_location.id",
                                                          ),
                                               )
-        
+
 
         # ---------------------------------------------------------------------
         # Service types at service location
@@ -2696,7 +2698,7 @@ def model(self):
                      #s3_comments(),
                      *s3_meta_fields()
                      )
-        
+
         # ---------------------------------------------------------------------
         # Pass names back to global scope (s3.*)
         #
@@ -5725,6 +5727,8 @@ def org_rheader(r, tabs=[]):
                     append_tab((T("Tags"), "tag"))
                 if settings.get_org_resources_tab():
                     tabs.insert(-1, (T("Resources"), "resource"))
+                if settings.get_org_service_locations():
+                    tabs.insert(-1, (T("Service Locations"), "service_location"))
 
             if settings.get_L10n_translate_org_organisation():
                     tabs.insert(1, (T("Local Names"), "name"))

modules/templates/RW/config.py

@@ -141,6 +141,7 @@ def config(settings):
     # -------------------------------------------------------------------------
     # Organisations
     settings.org.tags = True
+    settings.org.service_locations = True
 
     # -------------------------------------------------------------------------
     # Project Module
@@ -422,6 +423,7 @@ def customise_org_organisation_resource(r, tablename):
     def customise_org_organisation_controller(**attr):
 
         tabs = [(T("Basic Details"), None),
+                (T("Service Locations"), "service_location"),
                 (T("Needs"), "needs"),
                 (T("Facilities"), "facility"),
                 (T("Warehouses"), "warehouse"),