fix

silverbackhq · Jun 3, 2020 · d982d94 · d982d94
1 parent 2a2a1c2
commit d982d94
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 30 deletions.
diff --git a/app/controllers/web/admin/activity.py b/app/controllers/web/admin/activity.py
@@ -38,7 +38,7 @@ def get(self, request):
         self.__upgrade = Upgrade()
         self.__acl = ACL()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
 
         self.context_push({
             "page_title": _("Activity · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))

diff --git a/app/controllers/web/admin/builder.py b/app/controllers/web/admin/builder.py
@@ -41,8 +41,8 @@ def get(self, request):
         self.__component = ComponentModule()
         self.__component_group = ComponentGroupModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
-        self.__context.load_options({
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.load_options({
             "builder_headline": "",
             "builder_favicon_url": "",
             "builder_logo_url": "",

diff --git a/app/controllers/web/admin/component.py b/app/controllers/web/admin/component.py
@@ -37,7 +37,7 @@ def get(self, request):
 
         self.__component = ComponentModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Components · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -55,7 +55,7 @@ def get(self, request):
 
         self.__component = ComponentModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Add a Component · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "groups": self.__component.get_all_groups()
@@ -79,7 +79,7 @@ def get(self, request, component_id):
             raise Http404("Component not found.")
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Edit Component · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "component": component,

diff --git a/app/controllers/web/admin/component_group.py b/app/controllers/web/admin/component_group.py
@@ -37,7 +37,7 @@ def get(self, request):
 
         self.__component_group = ComponentGroupModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Component Groups · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -55,7 +55,7 @@ def get(self, request):
 
         self.__component_group = ComponentGroupModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Add a Component Group · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -78,7 +78,7 @@ def get(self, request, group_id):
             raise Http404("Component group not found.")
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Edit Component Group · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "group": group

diff --git a/app/controllers/web/admin/dashboard.py b/app/controllers/web/admin/dashboard.py
@@ -36,7 +36,7 @@ def get(self, request):
 
         self.__dashboard = DashboardModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Dashboard · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "count": {

diff --git a/app/controllers/web/admin/incident.py b/app/controllers/web/admin/incident.py
@@ -43,7 +43,7 @@ def get(self, request):
         self.__component = ComponentModule()
         self.__component_group = ComponentGroupModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Incidents · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -64,7 +64,7 @@ def get(self, request):
         self.__component = ComponentModule()
         self.__component_group = ComponentGroupModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Add an Incident · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -90,7 +90,7 @@ def get(self, request, incident_id):
             raise Http404("Incident not found.")
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Edit Incident · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "incident": incident
@@ -117,7 +117,7 @@ def get(self, request, incident_id):
             raise Http404("Incident not found.")
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("View Incident · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "incident": incident

diff --git a/app/controllers/web/admin/incident_update.py b/app/controllers/web/admin/incident_update.py
@@ -51,7 +51,7 @@ def get(self, request, incident_id):
             raise Http404("Incident not found.")
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Add Incident Update  · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "incident": incident
@@ -99,7 +99,7 @@ def get(self, request, incident_id, update_id):
         affected_components = self.__format_affected_components(self.__incident_update_component.get_all(update_id))
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("View Incident Update  · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "update": update,
@@ -158,7 +158,7 @@ def get(self, request, incident_id, update_id):
             raise Http404("Incident update not found.")
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Edit Incident Update  · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "update": update,

diff --git a/app/controllers/web/admin/metric.py b/app/controllers/web/admin/metric.py
@@ -38,7 +38,7 @@ def get(self, request):
 
         self.__metric = MetricModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Metrics · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -56,7 +56,7 @@ def get(self, request):
 
         self.__metric = MetricModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Add a Metric · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -79,7 +79,7 @@ def get(self, request, metric_id):
             raise Http404("Metric not found.")
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Edit Metric · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "metric": metric

diff --git a/app/controllers/web/admin/notification.py b/app/controllers/web/admin/notification.py
@@ -36,7 +36,7 @@ def get(self, request):
 
         self.__acl = ACL()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
 
         self.context_push({
             "page_title": _("Notification · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))

diff --git a/app/controllers/web/admin/profile.py b/app/controllers/web/admin/profile.py
@@ -37,7 +37,7 @@ def get(self, request):
         self.__profile = ProfileModule()
         self.__user_id = request.user.id
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Profile · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })

diff --git a/app/controllers/web/admin/settings.py b/app/controllers/web/admin/settings.py
@@ -38,8 +38,8 @@ def get(self, request):
         self.__upgrade = Upgrade()
         self.__acl = ACL()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
-        self.__context.load_options({
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.load_options({
             "app_name": "",
             "app_email": "",
             "app_url": "",

diff --git a/app/controllers/web/admin/subscriber.py b/app/controllers/web/admin/subscriber.py
@@ -37,7 +37,7 @@ def get(self, request):
 
         self.__subscriber = SubscriberModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Subscribers · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -55,7 +55,7 @@ def get(self, request):
 
         self.__subscriber = SubscriberModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Add an Subscriber · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -78,7 +78,7 @@ def get(self, request, subscriber_id):
             raise Http404("Subscriber not found.")
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Edit Subscriber · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "subscriber": subscriber

diff --git a/app/controllers/web/admin/user.py b/app/controllers/web/admin/user.py
@@ -37,7 +37,7 @@ def get(self, request):
 
         self.__user = UserModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Users · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -55,7 +55,7 @@ def get(self, request):
 
         self.__user = UserModule()
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Add a User · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
         })
@@ -78,7 +78,7 @@ def get(self, request, user_id):
             raise Http404("User not found.")
 
         self.autoload_options()
-        self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
+        self.autoload_user(request.user.id if request.user.is_authenticated else None)
         self.context_push({
             "page_title": _("Edit User · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
             "user": user