Mercurial > kallithea
annotate rhodecode/controllers/admin/notifications.py @ 3455:d5ae996eed11 beta
show ip for my account, and only in editing your user, showing in all users next to API key is misleading
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 05 Mar 2013 11:39:30 +0100 |
parents | edb9a42def31 |
children | 260a7a01b054 |
rev | line source |
---|---|
1824
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
1 # -*- coding: utf-8 -*- |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
2 """ |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
3 rhodecode.controllers.admin.notifications |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
4 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
5 |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
6 notifications controller for RhodeCode |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
7 |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
8 :created_on: Nov 23, 2010 |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
9 :author: marcink |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
10 :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com> |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
11 :license: GPLv3, see COPYING for more details. |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
12 """ |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
13 # This program is free software: you can redistribute it and/or modify |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
14 # it under the terms of the GNU General Public License as published by |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
15 # the Free Software Foundation, either version 3 of the License, or |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
16 # (at your option) any later version. |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
17 # |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
18 # This program is distributed in the hope that it will be useful, |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
19 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
21 # GNU General Public License for more details. |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
22 # |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
23 # You should have received a copy of the GNU General Public License |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
24 # along with this program. If not, see <http://www.gnu.org/licenses/>. |
89efedac4e6c
2012 copyrights
Marcin Kuzminski <marcin@python-works.com>
parents:
1818
diff
changeset
|
25 |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
26 import logging |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
27 import traceback |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
28 |
1791
2aee0dc1784e
mark all read button for notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
1739
diff
changeset
|
29 from pylons import request |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
30 from pylons import tmpl_context as c, url |
3428
edb9a42def31
fix to strict permission check on notification messages
Marcin Kuzminski <marcin@python-works.com>
parents:
3141
diff
changeset
|
31 from pylons.controllers.util import redirect, abort |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
32 |
2190
64f7cf8f6a33
notification inbox improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
1824
diff
changeset
|
33 from webhelpers.paginate import Page |
64f7cf8f6a33
notification inbox improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
1824
diff
changeset
|
34 |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
35 from rhodecode.lib.base import BaseController, render |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
36 from rhodecode.model.db import Notification |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
37 |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
38 from rhodecode.model.notification import NotificationModel |
1739
4a5b93b3bcdd
forbid notifications view for anonymous users
Marcin Kuzminski <marcin@python-works.com>
parents:
1723
diff
changeset
|
39 from rhodecode.lib.auth import LoginRequired, NotAnonymous |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
40 from rhodecode.lib import helpers as h |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
41 from rhodecode.model.meta import Session |
2845
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2662
diff
changeset
|
42 from rhodecode.lib.utils2 import safe_int |
1723
64e91067b996
- refactoring to overcome poor usage of global pylons config
Marcin Kuzminski <marcin@python-works.com>
parents:
1713
diff
changeset
|
43 |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
44 |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
45 log = logging.getLogger(__name__) |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
46 |
1791
2aee0dc1784e
mark all read button for notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
1739
diff
changeset
|
47 |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
48 class NotificationsController(BaseController): |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
49 """REST Controller styled on the Atom Publishing Protocol""" |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
50 # To properly map this controller, ensure your config/routing.py |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
51 # file has a resource setup: |
1818
cf51bbfb120e
auto white-space removal
Marcin Kuzminski <marcin@python-works.com>
parents:
1791
diff
changeset
|
52 # map.resource('notification', 'notifications', controller='_admin/notifications', |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
53 # path_prefix='/_admin', name_prefix='_admin_') |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
54 |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
55 @LoginRequired() |
1739
4a5b93b3bcdd
forbid notifications view for anonymous users
Marcin Kuzminski <marcin@python-works.com>
parents:
1723
diff
changeset
|
56 @NotAnonymous() |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
57 def __before__(self): |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
58 super(NotificationsController, self).__before__() |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
59 |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
60 def index(self, format='html'): |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
61 """GET /_admin/notifications: All items in the collection""" |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
62 # url('notifications') |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
63 c.user = self.rhodecode_user |
2433
74f2910f7ad9
Added pull requests filter into notification inbox.
Marcin Kuzminski <marcin@python-works.com>
parents:
2190
diff
changeset
|
64 notif = NotificationModel().get_for_user(self.rhodecode_user.user_id, |
2503
d04243e932cc
Added filtering on inbox by comments
Marcin Kuzminski <marcin@python-works.com>
parents:
2433
diff
changeset
|
65 filter_=request.GET.getall('type')) |
2845
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2662
diff
changeset
|
66 |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2662
diff
changeset
|
67 p = safe_int(request.params.get('page', 1), 1) |
2190
64f7cf8f6a33
notification inbox improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
1824
diff
changeset
|
68 c.notifications = Page(notif, page=p, items_per_page=10) |
2433
74f2910f7ad9
Added pull requests filter into notification inbox.
Marcin Kuzminski <marcin@python-works.com>
parents:
2190
diff
changeset
|
69 c.pull_request_type = Notification.TYPE_PULL_REQUEST |
2503
d04243e932cc
Added filtering on inbox by comments
Marcin Kuzminski <marcin@python-works.com>
parents:
2433
diff
changeset
|
70 c.comment_type = [Notification.TYPE_CHANGESET_COMMENT, |
d04243e932cc
Added filtering on inbox by comments
Marcin Kuzminski <marcin@python-works.com>
parents:
2433
diff
changeset
|
71 Notification.TYPE_PULL_REQUEST_COMMENT] |
2519
f8742e1acf08
add highlight of current filter in notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2503
diff
changeset
|
72 |
f8742e1acf08
add highlight of current filter in notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2503
diff
changeset
|
73 _current_filter = request.GET.getall('type') |
f8742e1acf08
add highlight of current filter in notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2503
diff
changeset
|
74 c.current_filter = 'all' |
f8742e1acf08
add highlight of current filter in notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2503
diff
changeset
|
75 if _current_filter == [c.pull_request_type]: |
f8742e1acf08
add highlight of current filter in notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2503
diff
changeset
|
76 c.current_filter = 'pull_request' |
f8742e1acf08
add highlight of current filter in notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2503
diff
changeset
|
77 elif _current_filter == c.comment_type: |
f8742e1acf08
add highlight of current filter in notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2503
diff
changeset
|
78 c.current_filter = 'comment' |
f8742e1acf08
add highlight of current filter in notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2503
diff
changeset
|
79 |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
80 return render('admin/notifications/notifications.html') |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
81 |
1791
2aee0dc1784e
mark all read button for notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
1739
diff
changeset
|
82 def mark_all_read(self): |
2aee0dc1784e
mark all read button for notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
1739
diff
changeset
|
83 if request.environ.get('HTTP_X_PARTIAL_XHR'): |
2aee0dc1784e
mark all read button for notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
1739
diff
changeset
|
84 nm = NotificationModel() |
2aee0dc1784e
mark all read button for notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
1739
diff
changeset
|
85 # mark all read |
2433
74f2910f7ad9
Added pull requests filter into notification inbox.
Marcin Kuzminski <marcin@python-works.com>
parents:
2190
diff
changeset
|
86 nm.mark_all_read_for_user(self.rhodecode_user.user_id, |
2503
d04243e932cc
Added filtering on inbox by comments
Marcin Kuzminski <marcin@python-works.com>
parents:
2433
diff
changeset
|
87 filter_=request.GET.getall('type')) |
2662
91c442a489bb
sqlalchemy sessions cleanup in admin
Marcin Kuzminski <marcin@python-works.com>
parents:
2610
diff
changeset
|
88 Session().commit() |
1791
2aee0dc1784e
mark all read button for notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
1739
diff
changeset
|
89 c.user = self.rhodecode_user |
2433
74f2910f7ad9
Added pull requests filter into notification inbox.
Marcin Kuzminski <marcin@python-works.com>
parents:
2190
diff
changeset
|
90 notif = nm.get_for_user(self.rhodecode_user.user_id, |
2503
d04243e932cc
Added filtering on inbox by comments
Marcin Kuzminski <marcin@python-works.com>
parents:
2433
diff
changeset
|
91 filter_=request.GET.getall('type')) |
2190
64f7cf8f6a33
notification inbox improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
1824
diff
changeset
|
92 c.notifications = Page(notif, page=1, items_per_page=10) |
1791
2aee0dc1784e
mark all read button for notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
1739
diff
changeset
|
93 return render('admin/notifications/notifications_data.html') |
2aee0dc1784e
mark all read button for notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
1739
diff
changeset
|
94 |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
95 def create(self): |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
96 """POST /_admin/notifications: Create a new item""" |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
97 # url('notifications') |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
98 |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
99 def new(self, format='html'): |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
100 """GET /_admin/notifications/new: Form to create a new item""" |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
101 # url('new_notification') |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
102 |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
103 def update(self, notification_id): |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
104 """PUT /_admin/notifications/id: Update an existing item""" |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
105 # Forms posted to this method should contain a hidden field: |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
106 # <input type="hidden" name="_method" value="PUT" /> |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
107 # Or using helpers: |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
108 # h.form(url('notification', notification_id=ID), |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
109 # method='put') |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
110 # url('notification', notification_id=ID) |
2610
3fdf7c3be2c9
added mark as read for single notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2519
diff
changeset
|
111 try: |
3fdf7c3be2c9
added mark as read for single notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2519
diff
changeset
|
112 no = Notification.get(notification_id) |
3141
a45191e7c7bb
access control: fix owner checks - they were always true
Mads Kiilerich <madski@unity3d.com>
parents:
2845
diff
changeset
|
113 owner = all(un.user.user_id == c.rhodecode_user.user_id |
a45191e7c7bb
access control: fix owner checks - they were always true
Mads Kiilerich <madski@unity3d.com>
parents:
2845
diff
changeset
|
114 for un in no.notifications_to_users) |
2610
3fdf7c3be2c9
added mark as read for single notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2519
diff
changeset
|
115 if h.HasPermissionAny('hg.admin')() or owner: |
3fdf7c3be2c9
added mark as read for single notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2519
diff
changeset
|
116 NotificationModel().mark_read(c.rhodecode_user.user_id, no) |
2662
91c442a489bb
sqlalchemy sessions cleanup in admin
Marcin Kuzminski <marcin@python-works.com>
parents:
2610
diff
changeset
|
117 Session().commit() |
2610
3fdf7c3be2c9
added mark as read for single notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2519
diff
changeset
|
118 return 'ok' |
3fdf7c3be2c9
added mark as read for single notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2519
diff
changeset
|
119 except Exception: |
3428
edb9a42def31
fix to strict permission check on notification messages
Marcin Kuzminski <marcin@python-works.com>
parents:
3141
diff
changeset
|
120 Session().rollback() |
2610
3fdf7c3be2c9
added mark as read for single notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2519
diff
changeset
|
121 log.error(traceback.format_exc()) |
3fdf7c3be2c9
added mark as read for single notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2519
diff
changeset
|
122 return 'fail' |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
123 |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
124 def delete(self, notification_id): |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
125 """DELETE /_admin/notifications/id: Delete an existing item""" |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
126 # Forms posted to this method should contain a hidden field: |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
127 # <input type="hidden" name="_method" value="DELETE" /> |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
128 # Or using helpers: |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
129 # h.form(url('notification', notification_id=ID), |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
130 # method='delete') |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
131 # url('notification', notification_id=ID) |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
132 |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
133 try: |
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
134 no = Notification.get(notification_id) |
3141
a45191e7c7bb
access control: fix owner checks - they were always true
Mads Kiilerich <madski@unity3d.com>
parents:
2845
diff
changeset
|
135 owner = all(un.user.user_id == c.rhodecode_user.user_id |
a45191e7c7bb
access control: fix owner checks - they were always true
Mads Kiilerich <madski@unity3d.com>
parents:
2845
diff
changeset
|
136 for un in no.notifications_to_users) |
2610
3fdf7c3be2c9
added mark as read for single notifications
Marcin Kuzminski <marcin@python-works.com>
parents:
2519
diff
changeset
|
137 if h.HasPermissionAny('hg.admin')() or owner: |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
138 NotificationModel().delete(c.rhodecode_user.user_id, no) |
2662
91c442a489bb
sqlalchemy sessions cleanup in admin
Marcin Kuzminski <marcin@python-works.com>
parents:
2610
diff
changeset
|
139 Session().commit() |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
140 return 'ok' |
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
141 except Exception: |
3428
edb9a42def31
fix to strict permission check on notification messages
Marcin Kuzminski <marcin@python-works.com>
parents:
3141
diff
changeset
|
142 Session().rollback() |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
143 log.error(traceback.format_exc()) |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
144 return 'fail' |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
145 |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
146 def show(self, notification_id, format='html'): |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
147 """GET /_admin/notifications/id: Show a specific item""" |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
148 # url('notification', notification_id=ID) |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
149 c.user = self.rhodecode_user |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
150 no = Notification.get(notification_id) |
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
151 |
3428
edb9a42def31
fix to strict permission check on notification messages
Marcin Kuzminski <marcin@python-works.com>
parents:
3141
diff
changeset
|
152 owner = any(un.user.user_id == c.rhodecode_user.user_id |
3141
a45191e7c7bb
access control: fix owner checks - they were always true
Mads Kiilerich <madski@unity3d.com>
parents:
2845
diff
changeset
|
153 for un in no.notifications_to_users) |
3428
edb9a42def31
fix to strict permission check on notification messages
Marcin Kuzminski <marcin@python-works.com>
parents:
3141
diff
changeset
|
154 |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
155 if no and (h.HasPermissionAny('hg.admin', 'repository.admin')() or owner): |
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
156 unotification = NotificationModel()\ |
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
157 .get_user_notification(c.user.user_id, no) |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
158 |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
159 # if this association to user is not valid, we don't want to show |
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
160 # this message |
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
161 if unotification: |
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
162 if unotification.read is False: |
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
163 unotification.mark_as_read() |
2662
91c442a489bb
sqlalchemy sessions cleanup in admin
Marcin Kuzminski <marcin@python-works.com>
parents:
2610
diff
changeset
|
164 Session().commit() |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
165 c.notification = no |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
166 |
1713
54687aa00724
Tests updates, Session refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1712
diff
changeset
|
167 return render('admin/notifications/show_notification.html') |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
168 |
3428
edb9a42def31
fix to strict permission check on notification messages
Marcin Kuzminski <marcin@python-works.com>
parents:
3141
diff
changeset
|
169 return abort(403) |
1712
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
170 |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
171 def edit(self, notification_id, format='html'): |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
172 """GET /_admin/notifications/id/edit: Form to edit an existing item""" |
cac5109ac3b6
Notification system improvements
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
173 # url('edit_notification', notification_id=ID) |