CCC: More locations fixing

VERSION

@@ -1 +1 @@
-2fdf0c175 (2019-07-15 19:49:59)
+abc44c340 (2019-07-15 20:08:41)

modules/templates/CCC/Demo/doc_document.csv

@@ -1,5 +1,5 @@
-Name,Country,L1,L2,Comments,Organisation,Author,Date,Attachment
-Allerdale Emergency Plan,GB,Cumbria,Allerdale,,Allerdale Community Organisation,[email protected],2019-07-01,
-Allerdale Evacuation Plan,GB,Cumbria,Allerdale,,Allerdale Community Organisation,[email protected],2019-07-02,
-Eden Emergency Plan,GB,Cumbria,Eden,,Eden Community Organisation,[email protected],2019-07-01,
-Eden Evacuation Plan,GB,Cumbria,Eden,,Eden Community Organisation,[email protected],2019-07-02,
+Name,Country,L1,L2,L3,Comments,Organisation,Author,Date,Attachment
+Allerdale Emergency Plan,GB,England,Cumbria,Allerdale,,Allerdale Community Organisation,[email protected],2019-07-01,
+Allerdale Evacuation Plan,GB,England,Cumbria,Allerdale,,Allerdale Community Organisation,[email protected],2019-07-02,
+Eden Emergency Plan,GB,England,Cumbria,Eden,,Eden Community Organisation,[email protected],2019-07-01,
+Eden Evacuation Plan,GB,England,Cumbria,Eden,,Eden Community Organisation,[email protected],2019-07-02,

modules/templates/CCC/config.py

@@ -711,7 +711,9 @@ def customise_hrm_training_event_resource(r, tablename):
         table.name.readable = table.name.writable = True
         f = table.location_id
         f.readable = f.writable = True
-        f.widget = S3LocationSelector(show_address = True)
+        f.widget = S3LocationSelector(levels = ("L3"),
+                                      required_levels = ("L3"),
+                                      show_address = True)
 
         list_fields = ["start_date",
                        "name",
@@ -1331,7 +1333,7 @@ def req_need_organisation_onaccept(form):
     def customise_req_need_resource(r, tablename):
 
         from s3 import IS_ONE_OF, IS_UTC_DATETIME, S3CalendarWidget, S3DateTime, \
-                       S3SQLCustomForm, S3SQLInlineComponent, \
+                       S3LocationSelector, S3SQLCustomForm, S3SQLInlineComponent, \
                        S3OptionsFilter, S3TextFilter, s3_comments_widget
 
         s3db = current.s3db
@@ -1377,6 +1379,9 @@ def customise_req_need_resource(r, tablename):
         f.requires = IS_UTC_DATETIME()
         f.widget = S3CalendarWidget(timepicker = True)
         table.end_date.readable = table.end_date.writable = True
+        table.location_id.widget = S3LocationSelector(levels = ("L3"),
+                                                      required_levels = ("L3"),
+                                                      show_address = True)
 
         current.response.s3.crud_strings[tablename] = Storage(
             label_create = T("New Opportunity"),