Mercurial > kallithea
changeset 760:fb7a3b291e64 beta
Cleaned up scm model codes,Admin/admin permissions controller codes
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 25 Nov 2010 22:55:10 +0100 |
parents | a7f50911a945 |
children | 56c2850a5b5f |
files | rhodecode/config/environment.py rhodecode/controllers/admin/admin.py rhodecode/controllers/admin/permissions.py |
diffstat | 3 files changed, 31 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/config/environment.py Thu Nov 25 22:16:29 2010 +0100 +++ b/rhodecode/config/environment.py Thu Nov 25 22:55:10 2010 +0100 @@ -71,7 +71,7 @@ config['pylons.app_globals'].baseui = make_ui('db') g = config['pylons.app_globals'] - repo2db_mapper(ScmModel().repo_scan(g.paths[0][1], g.baseui, initial)) + repo2db_mapper(ScmModel().repo_scan(g.paths[0][1], g.baseui)) set_available_permissions(config) set_base_path(config) set_rhodecode_config(config)
--- a/rhodecode/controllers/admin/admin.py Thu Nov 25 22:16:29 2010 +0100 +++ b/rhodecode/controllers/admin/admin.py Thu Nov 25 22:55:10 2010 +0100 @@ -1,8 +1,14 @@ -#!/usr/bin/env python -# encoding: utf-8 -# admin controller for pylons -# Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com> - +# -*- coding: utf-8 -*- +""" + package.rhodecode.controllers.admin.admin + ~~~~~~~~~~~~~~ + + Controller for Admin pannel of Rhodecode + :created_on: Apr 7, 2010 + :author: marcink + :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com> + :license: GPLv3, see COPYING for more details. +""" # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; version 2 @@ -17,15 +23,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. -""" -Created on April 7, 2010 -admin controller for pylons -@author: marcink -""" + import logging -from pylons import request, response, session, tmpl_context as c +from pylons import request, tmpl_context as c from rhodecode.lib.base import BaseController, render -from rhodecode.model import meta from rhodecode.model.db import UserLog from webhelpers.paginate import Page from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator @@ -33,19 +34,19 @@ log = logging.getLogger(__name__) class AdminController(BaseController): - + @LoginRequired() def __before__(self): super(AdminController, self).__before__() - - @HasPermissionAllDecorator('hg.admin') + + @HasPermissionAllDecorator('hg.admin') def index(self): - + users_log = self.sa.query(UserLog).order_by(UserLog.action_date.desc()) p = int(request.params.get('page', 1)) c.users_log = Page(users_log, page=p, items_per_page=10) c.log_data = render('admin/admin_log.html') if request.params.get('partial'): return c.log_data - return render('admin/admin.html') - + return render('admin/admin.html') +
--- a/rhodecode/controllers/admin/permissions.py Thu Nov 25 22:16:29 2010 +0100 +++ b/rhodecode/controllers/admin/permissions.py Thu Nov 25 22:55:10 2010 +0100 @@ -1,8 +1,14 @@ -#!/usr/bin/env python -# encoding: utf-8 -# permissions controller for pylons -# Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com> -# +# -*- coding: utf-8 -*- +""" + package.rhodecode.controllers.admin.permissions + ~~~~~~~~~~~~~~ + permissions controller for Rhodecode + + :created_on: Apr 27, 2010 + :author: marcink + :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com> + :license: GPLv3, see COPYING for more details. +""" # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; version 2 @@ -17,11 +23,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. -""" -Created on April 27, 2010 -permissions controller for pylons -@author: marcink -""" from formencode import htmlfill from pylons import request, session, tmpl_context as c, url