Mercurial > kallithea
changeset 3712:08cf7741e5e1 beta
removed obsolete admin_user tmpl context variables
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 08 Apr 2013 02:59:50 +0200 |
| parents | 58e309c59498 |
| children | e45f8cefd7d9 |
| files | rhodecode/controllers/admin/ldap_settings.py rhodecode/controllers/admin/permissions.py rhodecode/controllers/admin/repos.py rhodecode/controllers/admin/settings.py rhodecode/controllers/admin/users.py rhodecode/controllers/admin/users_groups.py rhodecode/lib/dbmigrate/schema/db_1_6_0.py rhodecode/lib/dbmigrate/schema/db_1_7_0.py |
| diffstat | 8 files changed, 2 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/ldap_settings.py Mon Apr 08 00:02:00 2013 +0200 +++ b/rhodecode/controllers/admin/ldap_settings.py Mon Apr 08 02:59:50 2013 +0200 @@ -71,8 +71,6 @@ @LoginRequired() @HasPermissionAllDecorator('hg.admin') def __before__(self): - c.admin_user = session.get('admin_user') - c.admin_username = session.get('admin_username') c.search_scope_choices = self.search_scope_choices c.tls_reqcert_choices = self.tls_reqcert_choices c.tls_kind_choices = self.tls_kind_choices
--- a/rhodecode/controllers/admin/permissions.py Mon Apr 08 00:02:00 2013 +0200 +++ b/rhodecode/controllers/admin/permissions.py Mon Apr 08 02:59:50 2013 +0200 @@ -53,8 +53,6 @@ @LoginRequired() @HasPermissionAllDecorator('hg.admin') def __before__(self): - c.admin_user = session.get('admin_user') - c.admin_username = session.get('admin_username') super(PermissionsController, self).__before__() self.repo_perms_choices = [('repository.none', _('None'),),
--- a/rhodecode/controllers/admin/repos.py Mon Apr 08 00:02:00 2013 +0200 +++ b/rhodecode/controllers/admin/repos.py Mon Apr 08 02:59:50 2013 +0200 @@ -64,8 +64,6 @@ @LoginRequired() def __before__(self): - c.admin_user = session.get('admin_user') - c.admin_username = session.get('admin_username') super(ReposController, self).__before__() def __load_defaults(self):
--- a/rhodecode/controllers/admin/settings.py Mon Apr 08 00:02:00 2013 +0200 +++ b/rhodecode/controllers/admin/settings.py Mon Apr 08 02:59:50 2013 +0200 @@ -67,15 +67,13 @@ @LoginRequired() def __before__(self): - c.admin_user = session.get('admin_user') - c.admin_username = session.get('admin_username') + super(SettingsController, self).__before__() c.modules = sorted([(p.project_name, p.version) for p in pkg_resources.working_set] + [('git', check_git_version())], key=lambda k: k[0].lower()) c.py_version = platform.python_version() c.platform = platform.platform() - super(SettingsController, self).__before__() @HasPermissionAllDecorator('hg.admin') def index(self, format='html'):
--- a/rhodecode/controllers/admin/users.py Mon Apr 08 00:02:00 2013 +0200 +++ b/rhodecode/controllers/admin/users.py Mon Apr 08 02:59:50 2013 +0200 @@ -61,8 +61,6 @@ @LoginRequired() @HasPermissionAllDecorator('hg.admin') def __before__(self): - c.admin_user = session.get('admin_user') - c.admin_username = session.get('admin_username') super(UsersController, self).__before__() c.available_permissions = config['available_permissions']
--- a/rhodecode/controllers/admin/users_groups.py Mon Apr 08 00:02:00 2013 +0200 +++ b/rhodecode/controllers/admin/users_groups.py Mon Apr 08 02:59:50 2013 +0200 @@ -59,8 +59,6 @@ @LoginRequired() @HasPermissionAllDecorator('hg.admin') def __before__(self): - c.admin_user = session.get('admin_user') - c.admin_username = session.get('admin_username') super(UsersGroupsController, self).__before__() c.available_permissions = config['available_permissions']
--- a/rhodecode/lib/dbmigrate/schema/db_1_6_0.py Mon Apr 08 00:02:00 2013 +0200 +++ b/rhodecode/lib/dbmigrate/schema/db_1_6_0.py Mon Apr 08 02:59:50 2013 +0200 @@ -2039,4 +2039,3 @@ repository_id = Column('repository_id', String(250), primary_key=True) repository_path = Column('repository_path', Text) version = Column('version', Integer) -
--- a/rhodecode/lib/dbmigrate/schema/db_1_7_0.py Mon Apr 08 00:02:00 2013 +0200 +++ b/rhodecode/lib/dbmigrate/schema/db_1_7_0.py Mon Apr 08 02:59:50 2013 +0200 @@ -23,4 +23,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from rhodecode.model.db import * \ No newline at end of file +from rhodecode.model.db import *