Skip to content

Commit d982d94

Browse files
ClivernClivern
committed
fix
1 parent 2a2a1c2 commit d982d94

13 files changed

+30
-30
lines changed

‎app/controllers/web/admin/activity.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def get(self, request):
3838
self.__upgrade = Upgrade()
3939
self.__acl = ACL()
4040
self.autoload_options()
41-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
41+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4242

4343
self.context_push({
4444
"page_title": _("Activity · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))

‎app/controllers/web/admin/builder.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def get(self, request):
4141
self.__component = ComponentModule()
4242
self.__component_group = ComponentGroupModule()
4343
self.autoload_options()
44-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
45-
self.__context.load_options({
44+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
45+
self.load_options({
4646
"builder_headline": "",
4747
"builder_favicon_url": "",
4848
"builder_logo_url": "",

‎app/controllers/web/admin/component.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get(self, request):
3737

3838
self.__component = ComponentModule()
3939
self.autoload_options()
40-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
40+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4141
self.context_push({
4242
"page_title": _("Components · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
4343
})
@@ -55,7 +55,7 @@ def get(self, request):
5555

5656
self.__component = ComponentModule()
5757
self.autoload_options()
58-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
58+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
5959
self.context_push({
6060
"page_title": _("Add a Component · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
6161
"groups": self.__component.get_all_groups()
@@ -79,7 +79,7 @@ def get(self, request, component_id):
7979
raise Http404("Component not found.")
8080

8181
self.autoload_options()
82-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
82+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
8383
self.context_push({
8484
"page_title": _("Edit Component · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
8585
"component": component,

‎app/controllers/web/admin/component_group.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get(self, request):
3737

3838
self.__component_group = ComponentGroupModule()
3939
self.autoload_options()
40-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
40+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4141
self.context_push({
4242
"page_title": _("Component Groups · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
4343
})
@@ -55,7 +55,7 @@ def get(self, request):
5555

5656
self.__component_group = ComponentGroupModule()
5757
self.autoload_options()
58-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
58+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
5959
self.context_push({
6060
"page_title": _("Add a Component Group · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
6161
})
@@ -78,7 +78,7 @@ def get(self, request, group_id):
7878
raise Http404("Component group not found.")
7979

8080
self.autoload_options()
81-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
81+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
8282
self.context_push({
8383
"page_title": _("Edit Component Group · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
8484
"group": group

‎app/controllers/web/admin/dashboard.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def get(self, request):
3636

3737
self.__dashboard = DashboardModule()
3838
self.autoload_options()
39-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
39+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4040
self.context_push({
4141
"page_title": _("Dashboard · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
4242
"count": {

‎app/controllers/web/admin/incident.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def get(self, request):
4343
self.__component = ComponentModule()
4444
self.__component_group = ComponentGroupModule()
4545
self.autoload_options()
46-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
46+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4747
self.context_push({
4848
"page_title": _("Incidents · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
4949
})
@@ -64,7 +64,7 @@ def get(self, request):
6464
self.__component = ComponentModule()
6565
self.__component_group = ComponentGroupModule()
6666
self.autoload_options()
67-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
67+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
6868
self.context_push({
6969
"page_title": _("Add an Incident · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
7070
})
@@ -90,7 +90,7 @@ def get(self, request, incident_id):
9090
raise Http404("Incident not found.")
9191

9292
self.autoload_options()
93-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
93+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
9494
self.context_push({
9595
"page_title": _("Edit Incident · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
9696
"incident": incident
@@ -117,7 +117,7 @@ def get(self, request, incident_id):
117117
raise Http404("Incident not found.")
118118

119119
self.autoload_options()
120-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
120+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
121121
self.context_push({
122122
"page_title": _("View Incident · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
123123
"incident": incident

‎app/controllers/web/admin/incident_update.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def get(self, request, incident_id):
5151
raise Http404("Incident not found.")
5252

5353
self.autoload_options()
54-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
54+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
5555
self.context_push({
5656
"page_title": _("Add Incident Update · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
5757
"incident": incident
@@ -99,7 +99,7 @@ def get(self, request, incident_id, update_id):
9999
affected_components = self.__format_affected_components(self.__incident_update_component.get_all(update_id))
100100

101101
self.autoload_options()
102-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
102+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
103103
self.context_push({
104104
"page_title": _("View Incident Update · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
105105
"update": update,
@@ -158,7 +158,7 @@ def get(self, request, incident_id, update_id):
158158
raise Http404("Incident update not found.")
159159

160160
self.autoload_options()
161-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
161+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
162162
self.context_push({
163163
"page_title": _("Edit Incident Update · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
164164
"update": update,

‎app/controllers/web/admin/metric.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def get(self, request):
3838

3939
self.__metric = MetricModule()
4040
self.autoload_options()
41-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
41+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4242
self.context_push({
4343
"page_title": _("Metrics · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
4444
})
@@ -56,7 +56,7 @@ def get(self, request):
5656

5757
self.__metric = MetricModule()
5858
self.autoload_options()
59-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
59+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
6060
self.context_push({
6161
"page_title": _("Add a Metric · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
6262
})
@@ -79,7 +79,7 @@ def get(self, request, metric_id):
7979
raise Http404("Metric not found.")
8080

8181
self.autoload_options()
82-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
82+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
8383
self.context_push({
8484
"page_title": _("Edit Metric · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
8585
"metric": metric

‎app/controllers/web/admin/notification.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def get(self, request):
3636

3737
self.__acl = ACL()
3838
self.autoload_options()
39-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
39+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4040

4141
self.context_push({
4242
"page_title": _("Notification · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))

‎app/controllers/web/admin/profile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get(self, request):
3737
self.__profile = ProfileModule()
3838
self.__user_id = request.user.id
3939
self.autoload_options()
40-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
40+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4141
self.context_push({
4242
"page_title": _("Profile · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
4343
})

‎app/controllers/web/admin/settings.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def get(self, request):
3838
self.__upgrade = Upgrade()
3939
self.__acl = ACL()
4040
self.autoload_options()
41-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
42-
self.__context.load_options({
41+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
42+
self.load_options({
4343
"app_name": "",
4444
"app_email": "",
4545
"app_url": "",

‎app/controllers/web/admin/subscriber.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get(self, request):
3737

3838
self.__subscriber = SubscriberModule()
3939
self.autoload_options()
40-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
40+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4141
self.context_push({
4242
"page_title": _("Subscribers · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
4343
})
@@ -55,7 +55,7 @@ def get(self, request):
5555

5656
self.__subscriber = SubscriberModule()
5757
self.autoload_options()
58-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
58+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
5959
self.context_push({
6060
"page_title": _("Add an Subscriber · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
6161
})
@@ -78,7 +78,7 @@ def get(self, request, subscriber_id):
7878
raise Http404("Subscriber not found.")
7979

8080
self.autoload_options()
81-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
81+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
8282
self.context_push({
8383
"page_title": _("Edit Subscriber · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
8484
"subscriber": subscriber

‎app/controllers/web/admin/user.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get(self, request):
3737

3838
self.__user = UserModule()
3939
self.autoload_options()
40-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
40+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
4141
self.context_push({
4242
"page_title": _("Users · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
4343
})
@@ -55,7 +55,7 @@ def get(self, request):
5555

5656
self.__user = UserModule()
5757
self.autoload_options()
58-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
58+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
5959
self.context_push({
6060
"page_title": _("Add a User · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback"))
6161
})
@@ -78,7 +78,7 @@ def get(self, request, user_id):
7878
raise Http404("User not found.")
7979

8080
self.autoload_options()
81-
self.__context.autoload_user(request.user.id if request.user.is_authenticated else None)
81+
self.autoload_user(request.user.id if request.user.is_authenticated else None)
8282
self.context_push({
8383
"page_title": _("Edit User · %s") % self.context_get("app_name", os.getenv("APP_NAME", "Silverback")),
8484
"user": user

0 commit comments

Comments
 (0)