equal
deleted
inserted
replaced
98 rights['unspecified'] = [access.deny] |
98 rights['unspecified'] = [access.deny] |
99 rights['any_access'] = [access.allow] |
99 rights['any_access'] = [access.allow] |
100 rights['edit'] = [access.checkIsLoggedIn] |
100 rights['edit'] = [access.checkIsLoggedIn] |
101 rights['roles'] = [access.checkIsUser] |
101 rights['roles'] = [access.checkIsUser] |
102 rights['signIn'] = [access.checkNotLoggedIn] |
102 rights['signIn'] = [access.checkNotLoggedIn] |
|
103 rights['notification'] = [access.checkIsUser] |
103 |
104 |
104 new_params = {} |
105 new_params = {} |
105 new_params['rights'] = rights |
106 new_params['rights'] = rights |
106 new_params['logic'] = soc.logic.models.user.logic |
107 new_params['logic'] = soc.logic.models.user.logic |
107 |
108 |
114 new_params['sidebar_heading'] = 'User (self)' |
115 new_params['sidebar_heading'] = 'User (self)' |
115 new_params['sidebar'] = [ |
116 new_params['sidebar'] = [ |
116 (users.create_login_url("user/edit"), 'Sign In', 'signIn'), |
117 (users.create_login_url("user/edit"), 'Sign In', 'signIn'), |
117 ('/' + new_params['url_name'] + '/edit', 'Profile', 'edit'), |
118 ('/' + new_params['url_name'] + '/edit', 'Profile', 'edit'), |
118 ('/' + new_params['url_name'] + '/roles', 'Roles', 'roles'), |
119 ('/' + new_params['url_name'] + '/roles', 'Roles', 'roles'), |
|
120 ('/' + 'notification/list', 'Notifications', 'notification'), |
119 ] |
121 ] |
120 |
122 |
121 patterns = [] |
123 patterns = [] |
122 |
124 |
123 page_name = "Profile" |
125 page_name = "Profile" |
125 'soc.views.models.%(module_name)s.edit', page_name)] |
127 'soc.views.models.%(module_name)s.edit', page_name)] |
126 |
128 |
127 page_name = "Requests Overview" |
129 page_name = "Requests Overview" |
128 patterns += [(r'^%(url_name)s/(?P<access_type>roles)$', |
130 patterns += [(r'^%(url_name)s/(?P<access_type>roles)$', |
129 'soc.views.models.request.list_self', page_name)] |
131 'soc.views.models.request.list_self', page_name)] |
130 |
132 |
131 new_params['django_patterns_defaults'] = patterns |
133 new_params['django_patterns_defaults'] = patterns |
132 |
134 |
133 params = dicts.merge(params, new_params) |
135 params = dicts.merge(params, new_params) |
134 |
136 |
135 super(View, self).__init__(params=params) |
137 super(View, self).__init__(params=params) |
136 |
138 |
137 EDIT_SELF_TMPL = 'soc/user/edit_self.html' |
139 EDIT_SELF_TMPL = 'soc/user/edit_self.html' |