##// END OF EJS Templates
removed obsolete admin_user tmpl context variables
marcink -
r3712:08cf7741 beta
parent child Browse files
Show More
@@ -71,8 +71,6 b' class LdapSettingsController(BaseControl'
71 @LoginRequired()
71 @LoginRequired()
72 @HasPermissionAllDecorator('hg.admin')
72 @HasPermissionAllDecorator('hg.admin')
73 def __before__(self):
73 def __before__(self):
74 c.admin_user = session.get('admin_user')
75 c.admin_username = session.get('admin_username')
76 c.search_scope_choices = self.search_scope_choices
74 c.search_scope_choices = self.search_scope_choices
77 c.tls_reqcert_choices = self.tls_reqcert_choices
75 c.tls_reqcert_choices = self.tls_reqcert_choices
78 c.tls_kind_choices = self.tls_kind_choices
76 c.tls_kind_choices = self.tls_kind_choices
@@ -53,8 +53,6 b' class PermissionsController(BaseControll'
53 @LoginRequired()
53 @LoginRequired()
54 @HasPermissionAllDecorator('hg.admin')
54 @HasPermissionAllDecorator('hg.admin')
55 def __before__(self):
55 def __before__(self):
56 c.admin_user = session.get('admin_user')
57 c.admin_username = session.get('admin_username')
58 super(PermissionsController, self).__before__()
56 super(PermissionsController, self).__before__()
59
57
60 self.repo_perms_choices = [('repository.none', _('None'),),
58 self.repo_perms_choices = [('repository.none', _('None'),),
@@ -64,8 +64,6 b' class ReposController(BaseRepoController'
64
64
65 @LoginRequired()
65 @LoginRequired()
66 def __before__(self):
66 def __before__(self):
67 c.admin_user = session.get('admin_user')
68 c.admin_username = session.get('admin_username')
69 super(ReposController, self).__before__()
67 super(ReposController, self).__before__()
70
68
71 def __load_defaults(self):
69 def __load_defaults(self):
@@ -67,15 +67,13 b' class SettingsController(BaseController)'
67
67
68 @LoginRequired()
68 @LoginRequired()
69 def __before__(self):
69 def __before__(self):
70 c.admin_user = session.get('admin_user')
70 super(SettingsController, self).__before__()
71 c.admin_username = session.get('admin_username')
72 c.modules = sorted([(p.project_name, p.version)
71 c.modules = sorted([(p.project_name, p.version)
73 for p in pkg_resources.working_set]
72 for p in pkg_resources.working_set]
74 + [('git', check_git_version())],
73 + [('git', check_git_version())],
75 key=lambda k: k[0].lower())
74 key=lambda k: k[0].lower())
76 c.py_version = platform.python_version()
75 c.py_version = platform.python_version()
77 c.platform = platform.platform()
76 c.platform = platform.platform()
78 super(SettingsController, self).__before__()
79
77
80 @HasPermissionAllDecorator('hg.admin')
78 @HasPermissionAllDecorator('hg.admin')
81 def index(self, format='html'):
79 def index(self, format='html'):
@@ -61,8 +61,6 b' class UsersController(BaseController):'
61 @LoginRequired()
61 @LoginRequired()
62 @HasPermissionAllDecorator('hg.admin')
62 @HasPermissionAllDecorator('hg.admin')
63 def __before__(self):
63 def __before__(self):
64 c.admin_user = session.get('admin_user')
65 c.admin_username = session.get('admin_username')
66 super(UsersController, self).__before__()
64 super(UsersController, self).__before__()
67 c.available_permissions = config['available_permissions']
65 c.available_permissions = config['available_permissions']
68
66
@@ -59,8 +59,6 b' class UsersGroupsController(BaseControll'
59 @LoginRequired()
59 @LoginRequired()
60 @HasPermissionAllDecorator('hg.admin')
60 @HasPermissionAllDecorator('hg.admin')
61 def __before__(self):
61 def __before__(self):
62 c.admin_user = session.get('admin_user')
63 c.admin_username = session.get('admin_username')
64 super(UsersGroupsController, self).__before__()
62 super(UsersGroupsController, self).__before__()
65 c.available_permissions = config['available_permissions']
63 c.available_permissions = config['available_permissions']
66
64
@@ -2039,4 +2039,3 b' class DbMigrateVersion(Base, BaseModel):'
2039 repository_id = Column('repository_id', String(250), primary_key=True)
2039 repository_id = Column('repository_id', String(250), primary_key=True)
2040 repository_path = Column('repository_path', Text)
2040 repository_path = Column('repository_path', Text)
2041 version = Column('version', Integer)
2041 version = Column('version', Integer)
2042
@@ -23,4 +23,4 b''
23 # You should have received a copy of the GNU General Public License
23 # You should have received a copy of the GNU General Public License
24 # along with this program. If not, see <http://www.gnu.org/licenses/>.
24 # along with this program. If not, see <http://www.gnu.org/licenses/>.
25
25
26 from rhodecode.model.db import * No newline at end of file
26 from rhodecode.model.db import *
General Comments 0
You need to be logged in to leave comments. Login now