SAMBRO: Display error DIV if map layer is missing (#1521)

* SAMBRO: Display error DIV if map layer is missing Fixes #1344 * Wrap error message with T()
sahana · Nov 20, 2019 · 5529818 · 5529818
1 parent a61515c
commit 5529818
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/modules/templates/SAMBRO/controllers.py b/modules/templates/SAMBRO/controllers.py
@@ -50,25 +50,29 @@ def __call__(self):
         except:
             current.log.error("Cannot find Layer for Map")
             layer_id = None
-
-        feature_resources = [{"name"      : T("Alerts"),
-                              "id"        : "search_results",
-                              "layer_id"  : layer_id,
-                              # @ToDo: Make the filter update timestamp on refresh in the client side
-                              "filter"    : "~.info.expires__gt=%s&~.external__ne=True" % request.utcnow,
-                              # We activate in callback after ensuring URL is updated for current filter status
-                              "active"    : False,
-                              }]
-
-        _map = current.gis.show_map(callback='''S3.search.s3map()''',
-                                    catalogue_layers=True,
-                                    collapsed=True,
-                                    feature_resources=feature_resources,
-                                    save=False,
-                                    search=True,
-                                    toolbar=True,
-                                    )
-        output["_map"] = _map
+            output["_map"] = DIV(
+                T("Cannot find Layer for Map"),
+                _class="mapError"
+                )
+        else:
+            feature_resources = [{"name"      : T("Alerts"),
+                                  "id"        : "search_results",
+                                  "layer_id"  : layer_id,
+                                  # @ToDo: Make the filter update timestamp on refresh in the client side
+                                  "filter"    : "~.info.expires__gt=%s&~.external__ne=True" % request.utcnow,
+                                  # We activate in callback after ensuring URL is updated for current filter status
+                                  "active"    : False,
+                                  }]
+
+            _map = current.gis.show_map(callback='''S3.search.s3map()''',
+                                        catalogue_layers=True,
+                                        collapsed=True,
+                                        feature_resources=feature_resources,
+                                        save=False,
+                                        search=True,
+                                        toolbar=True,
+                                        )
+            output["_map"] = _map
 
         # Filterable List of Alerts
         # - most recent first