kallithea Changeset - 0e5455fda8fd

Changeset - 0e5455fda8fd

Parent rev.

Child rev.

[Not reviewed]

default

0 13 1

Marcin Kuzminski - 15 years ago 2010-06-07 00:18:33
marcin@python-works.com

Implemented basic repository managment. Implemented repo2db mappings, model, helpers updates and code cleanups

14 files changed with 327 insertions and 75 deletions:

pylons_app/config/environment.py

pylons_app/controllers/repos.py

pylons_app/controllers/users.py

pylons_app/lib/auth.py

pylons_app/lib/helpers.py

pylons_app/lib/utils.py

pylons_app/model/db.py

pylons_app/model/forms.py

pylons_app/model/hg_model.py

pylons_app/model/repo_model.py

106

pylons_app/model/user_model.py

pylons_app/templates/admin/repos/repo_add.html

pylons_app/templates/admin/repos/repo_edit.html

pylons_app/templates/summary/summary.html

0 comments (0 inline, 0 general)

pylons_app/config/environment.py

➞

Show inline comments

@@ @@ -3,12 +3,13 @@ from mako.lookup import TemplateLookup @@
 from pylons.configuration import PylonsConfig
 from pylons.error import handle_mako_error
 from pylons_app.config.routing import make_map
 from pylons_app.lib.auth import set_available_permissions
 from pylons_app.lib.utils import repo2db_mapper
 from pylons_app.model import init_model
 from pylons_app.model.hg_model import _get_repos_cached_initial
 from sqlalchemy import engine_from_config
 import logging
 import os
 import pylons_app.lib.app_globals as app_globals
 import pylons_app.lib.helpers
@@ @@ -57,12 +58,12 @@ def load_environment(global_conf, app_co @@
         sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.',
                                                             proxy=TimerProxy())
     else:
         sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
     init_model(sa_engine_db1)
     repo2db_mapper()
+    repo2db_mapper(_get_repos_cached_initial(config['pylons.app_globals']))
     set_available_permissions(config)
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)
     return config

pylons_app/controllers/repos.py

➞

Show inline comments

 #!/usr/bin/env python
 # encoding: utf-8
 # repos controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
 # 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
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
@@ @@ -19,26 +18,31 @@ @@
 # MA  02110-1301, USA.
 """
 Created on April 7, 2010
 admin controller for pylons
 @author: marcink
 """
-import logging
+from operator import itemgetter
 from pylons import request, response, session, tmpl_context as c, url, \
     app_globals as g
 from pylons.controllers.util import abort, redirect
 from pylons_app.lib.auth import LoginRequired
 from pylons.i18n.translation import _
 from pylons_app.lib import helpers as h
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib.filters import clean_repo
 from pylons_app.lib.utils import check_repo, invalidate_cache
 from pylons_app.lib.utils import invalidate_cache
 from pylons_app.model.repo_model import RepoModel
 from pylons_app.model.hg_model import HgModel
 from pylons_app.model.forms import RepoForm
 from pylons_app.model.meta import Session
 from datetime import datetime
 import formencode
 from formencode import htmlfill
 import logging
 import os
 import shutil
 from operator import itemgetter
 log = logging.getLogger(__name__)
 class ReposController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
@@ @@ -56,72 +60,108 @@ class ReposController(BaseController): @@
         c.repos_list = sorted(cached_repo_list, key=itemgetter('name_sort'))
         return render('admin/repos/repos.html')
     def create(self):
         """POST /repos: Create a new item"""
         # url('repos')
         name = request.POST.get('name')
         repo_model = RepoModel()
         _form = RepoForm()()
         try:
             self._create_repo(name)
             #clear our cached list for refresh with new repo
             form_result = _form.to_python(dict(request.POST))
             repo_model.create(form_result, c.hg_app_user)
             invalidate_cache('cached_repo_list')
             h.flash(_('created repository %s') % name, category='success')
         except Exception as e:
             log.error(e)
             h.flash(_('created repository %s') % form_result['repo_name'],
                     category='success')
         except formencode.Invalid as errors:
             c.form_errors = errors.error_dict
             c.new_repo = errors.value['repo_name']
             return htmlfill.render(
                  render('admin/repos/repo_add.html'),
                 defaults=errors.value,
                 encoding="UTF-8")
         except Exception:
             h.flash(_('error occured during creation of repository %s') \
                     % form_result['repo_name'], category='error')
         return redirect('repos')
     def _create_repo(self, repo_name):
         repo_path = os.path.join(g.base_path, repo_name)
         if check_repo(repo_name, g.base_path):
             log.info('creating repo %s in %s', repo_name, repo_path)
             from vcs.backends.hg import MercurialRepository
             MercurialRepository(repo_path, create=True)
     def new(self, format='html'):
         """GET /repos/new: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
-        c.new_repo = clean_repo(new_repo)
+        c.new_repo = h.repo_name_slug(new_repo)
         return render('admin/repos/repo_add.html')
     def update(self, id):
         """PUT /repos/id: Update an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('repo', id=ID),
         #           method='put')
         # url('repo', id=ID)
         repo_model = RepoModel()
         _form = RepoForm(edit=True)()
         try:
             form_result = _form.to_python(dict(request.POST))
             repo_model.update(id, form_result)
             invalidate_cache('cached_repo_list')
             h.flash(_('Repository updated succesfully'), category='success')
         except formencode.Invalid as errors:
             c.repo_info = repo_model.get(id)
             c.form_errors = errors.error_dict
             return htmlfill.render(
                  render('admin/repos/repo_edit.html'),
                 defaults=errors.value,
                 encoding="UTF-8")
         except Exception:
             h.flash(_('error occured during update of repository %s') \
                     % form_result['repo_name'], category='error')
         return redirect(url('repos'))
     def delete(self, id):
         """DELETE /repos/id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('repo', id=ID),
         #           method='delete')
         # url('repo', id=ID)
         from datetime import datetime
         path = g.paths[0][1].replace('*', '')
         rm_path = os.path.join(path, id)
         log.info("Removing %s", rm_path)
         shutil.move(os.path.join(rm_path, '.hg'), os.path.join(rm_path, 'rm__.hg'))
         shutil.move(rm_path, os.path.join(path, 'rm__%s-%s' % (datetime.today(), id)))
         repo_model = RepoModel()
         repo = repo_model.get(id)
         if not repo:
             h.flash(_('%s repository is not mapped to db perhaps'
                       ' it was moved or renamed please run the application again'
                       ' in order to rescan repositories') % id, category='error')
         #clear our cached list for refresh with new repo
         invalidate_cache('cached_repo_list')
         h.flash(_('deleted repository %s') % rm_path, category='success')
             return redirect(url('repos'))
         try:
             repo_model.delete(repo)
             invalidate_cache('cached_repo_list')
             h.flash(_('deleted repository %s') % id, category='success')
         except Exception:
             h.flash(_('An error occured during deletion of %s') % id,
                     category='error')
         return redirect(url('repos'))
     def show(self, id, format='html'):
         """GET /repos/id: Show a specific item"""
         # url('repo', id=ID)
     def edit(self, id, format='html'):
         """GET /repos/id/edit: Form to edit an existing item"""
         # url('edit_repo', id=ID)
         c.new_repo = id
         return render('admin/repos/repo_edit.html')
         repo_model = RepoModel()
         c.repo_info = repo_model.get(id)
         defaults = c.repo_info.__dict__
         defaults.update({'user':c.repo_info.user.username})
         return htmlfill.render(
             render('admin/repos/repo_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
+        )

pylons_app/controllers/users.py

➞

Show inline comments

@@ @@ -20,23 +20,23 @@ @@
 """
 Created on April 4, 2010
 users controller for pylons
 @author: marcink
 """
 import logging
 from formencode import htmlfill
 from pylons import request, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from pylons_app.lib import helpers as h
 from pylons_app.lib.auth import LoginRequired, CheckPermissionAll
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.db import User, UserLog
 from pylons_app.model.forms import UserForm
 from pylons_app.model.user_model import UserModel
 import formencode
 from formencode import htmlfill
 log = logging.getLogger(__name__)
 class UsersController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
@@ @@ -62,21 +62,24 @@ class UsersController(BaseController): @@
         user_model = UserModel()
         login_form = UserForm()()
         try:
             form_result = login_form.to_python(dict(request.POST))
             user_model.create(form_result)
             h.flash(_('created user %s') % form_result['username'], category='success')
             return redirect(url('users'))
             h.flash(_('created user %s') % form_result['username'],
                     category='success')
         except formencode.Invalid as errors:
             c.form_errors = errors.error_dict
             return htmlfill.render(
                  render('admin/users/user_add.html'),
                 defaults=errors.value,
                 encoding="UTF-8")
         except Exception:
             h.flash(_('error occured during creation of user %s') \
                     % form_result['username'], category='error')
         return redirect(url('users'))
     def new(self, format='html'):
         """GET /users/new: Form to create a new item"""
         # url('new_user')
         return render('admin/users/user_add.html')
@@ @@ -86,42 +89,47 @@ class UsersController(BaseController): @@
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('user', id=ID),
         #           method='put')
         # url('user', id=ID)
         user_model = UserModel()
-        login_form = UserForm(edit=True)()
+        _form = UserForm(edit=True)()
         try:
-            form_result = login_form.to_python(dict(request.POST))
+            form_result = _form.to_python(dict(request.POST))
             user_model.update(id, form_result)
             h.flash(_('User updated succesfully'), category='success')
             return redirect(url('users'))
         except formencode.Invalid as errors:
             c.user = user_model.get_user(id)
             c.form_errors = errors.error_dict
             return htmlfill.render(
                  render('admin/users/user_edit.html'),
                 defaults=errors.value,
                 encoding="UTF-8")
         except Exception:
             h.flash(_('error occured during update of user %s') \
                     % form_result['username'], category='error')
         return redirect(url('users'))
     def delete(self, id):
         """DELETE /users/id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('user', id=ID),
         #           method='delete')
         # url('user', id=ID)
         user_model = UserModel()
         try:
             self.sa.delete(self.sa.query(User).get(id))
             self.sa.commit()
             user_model.delete(id)
             h.flash(_('sucessfully deleted user'), category='success')
         except:
             self.sa.rollback()
             raise
         except Exception:
             h.flash(_('An error occured during deletion of user'),
                     category='error')
         return redirect(url('users'))
     def show(self, id, format='html'):
         """GET /users/id: Show a specific item"""
         # url('user', id=ID)

pylons_app/lib/auth.py

➞

Show inline comments

@@ @@ -62,12 +62,13 @@ def authfunc(environ, username, password @@
 class  AuthUser(object):
     """
     A simple object that handles a mercurial username for authentication
     """
     username = 'None'
     user_id = None
     is_authenticated = False
     is_admin = False
     permissions = set()
     group = set()
     def __init__(self):

pylons_app/lib/helpers.py

➞

Show inline comments

@@ @@ -111,17 +111,15 @@ def recursive_replace(str, replace=' '): @@
 def repo_name_slug(value):
     """
     Return slug of name of repository
     """
     slug = urlify(value)
     for c in """=[]\;',/~!@#$%^&*()+{}|:""":
+    for c in """=[]\;'"<>,/~!@#$%^&*()+{}|:""":
         slug = slug.replace(c, '-')
     print slug
     slug = recursive_replace(slug, '-')
     print slug
     return slug
 files_breadcrumbs = _FilesBreadCrumbs()
 link = _Link()
 flash = _Flash()
 get_error = _GetError()

pylons_app/lib/utils.py

➞

Show inline comments

@@ @@ -25,12 +25,13 @@ Utilities for hg app @@
 """
 import os
 import logging
 from mercurial import ui, config, hg
 from mercurial.error import RepoError
 from pylons_app.model.db import Repository, User
 log = logging.getLogger(__name__)
 def get_repo_slug(request):
     return request.environ['pylons.routes_dict'].get('repo_name')
@@ @@ -149,12 +150,31 @@ class EmptyChangeset(BaseChangeset): @@
         Returns raw string identifing this changeset, useful for web
         representation.
         """
         return '0' * 12
 def repo2db_mapper():
 def repo2db_mapper(initial_repo_list):
     """
     maps all found repositories into db
     """
     scann all dirs for .hgdbid
     if some dir doesn't have one generate one.
     """
     pass
     from pylons_app.model.meta import Session
     sa = Session()
     user = sa.query(User).filter(User.admin == True).first()
     for name, repo in initial_repo_list.items():
         if not sa.query(Repository).get(name):
             log.info('%s not found creating default', name)
             try:
                 new_repo = Repository()
                 new_repo.repo_name = name
                 desc = repo.description if repo.description != 'unknown' else \
                                             'auto description for %s' % name
                 new_repo.description = desc
                 new_repo.user_id = user.user_id
                 new_repo.private = False
                 sa.add(new_repo)
                 sa.commit()
             except:
                 sa.rollback()
                 raise

pylons_app/model/db.py

➞

Show inline comments

 from pylons_app.model.meta import Base
 from sqlalchemy.orm import relation, backref
 from sqlalchemy import *
 from vcs.utils.lazy import LazyProperty
 class User(Base):
     __tablename__ = 'users'
     __table_args__ = {'useexisting':True}
-    user_id = Column("user_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1)
+    user_id = Column("user_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True)
     username = Column("username", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     password = Column("password", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     active = Column("active", BOOLEAN(), nullable=True, unique=None, default=None)
     admin = Column("admin", BOOLEAN(), nullable=True, unique=None, default=None)
     name = Column("name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     lastname = Column("lastname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     email = Column("email", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     last_login = Column("last_login", DATETIME(timezone=False), nullable=True, unique=None, default=None)
     user_log = relation('UserLog')
     @LazyProperty
     def full_contact(self):
         return '%s %s <%s>' % (self.name, self.lastname, self.email)
     def __repr__(self):
         return "<User('%s:%s')>" % (self.user_id, self.username)
 class UserLog(Base):
     __tablename__ = 'user_logs'
     __table_args__ = {'useexisting':True}
     user_log_id = Column("user_log_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1)
-    user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=True, unique=None, default=None)
+    user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None)
     repository = Column("repository", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action = Column("action", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action_date = Column("action_date", DATETIME(timezone=False), nullable=True, unique=None, default=None)
     user = relation('User')
 class Repository(Base):
     __tablename__ = 'repositories'
     repo_id = Column("repo_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1)
     repo_name = Column("repo_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=True, unique=None, default=None)
     repo_name = Column("repo_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=False, default=None)
     private = Column("private", BOOLEAN(), nullable=True, unique=None, default=None)
+    description = Column("description", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     user = relation('User')
 class Permission(Base):
     __tablename__ = 'permissions'
     __table_args__ = {'useexisting':True}
     permission_id = Column("id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1)
     permission_name = Column("permission_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     permission_longname = Column("permission_longname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

pylons_app/model/forms.py

➞

Show inline comments

@@ @@ -22,14 +22,15 @@ for SELECT use formencode.All(OneOf(list @@
 from formencode import All
 from formencode.validators import UnicodeString, OneOf, Int, Number, Regex, \
     Email, Bool, StringBoolean
 from pylons import session
 from pylons.i18n.translation import _
 from pylons_app.lib.auth import get_crypt_password
 import pylons_app.lib.helpers as h
 from pylons_app.model import meta
 from pylons_app.model.db import User
+from pylons_app.model.db import User, Repository
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
 from webhelpers.pylonslib.secure_form import authentication_token
 import datetime
 import formencode
 import logging
@@ @@ -90,12 +91,13 @@ class ValidAuth(formencode.validators.Fa @@
                 if user.username == username and user.password == crypted_passwd:
                     from pylons_app.lib.auth import AuthUser
                     auth_user = AuthUser()
                     auth_user.username = username
                     auth_user.is_authenticated = True
                     auth_user.is_admin = user.admin
                     auth_user.user_id = user.user_id
                     session['hg_app_user'] = auth_user
                     session.save()
                     log.info('user %s is now authenticated', username)
                     try:
                         user.last_login = datetime.datetime.now()
@@ @@ -116,13 +118,36 @@ class ValidAuth(formencode.validators.Fa @@
                 raise formencode.Invalid(self.message('disabled_account',
                                          state=State_obj),
                                          value, state,
                                          error_dict=self.e_dict_disable)
 class ValidRepoUser(formencode.validators.FancyValidator):
     def to_python(self, value, state):
         sa = meta.Session
         try:
             self.user_db = sa.query(User).filter(User.username == value).one()
         except Exception:
             raise formencode.Invalid(_('This username is not valid'),
                                      value, state)
         return self.user_db.user_id
 def ValidRepoName(edit=False):
     class _ValidRepoName(formencode.validators.FancyValidator):
         def to_python(self, value, state):
             slug = h.repo_name_slug(value)
             sa = meta.Session
             if sa.query(Repository).get(slug) and not edit:
                 raise formencode.Invalid(_('This repository already exists'),
                                          value, state)
             return slug
     return _ValidRepoName
 #===============================================================================
 # FORMS
 #===============================================================================
 class LoginForm(formencode.Schema):
     allow_extra_fields = True
     filter_extra_fields = True
@@ @@ -160,6 +185,19 @@ def UserForm(edit=False): @@
         active = StringBoolean(if_missing=False)
         name = UnicodeString(strip=True, min=3, not_empty=True)
         lastname = UnicodeString(strip=True, min=3, not_empty=True)
         email = Email(not_empty=True)
     return _UserForm
 def RepoForm(edit=False):
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit))
         description = UnicodeString(strip=True, min=3, not_empty=True)
         private = StringBoolean(if_missing=False)
         if edit:
             user = All(Int(not_empty=True), ValidRepoUser)
     return _RepoForm

pylons_app/model/hg_model.py

➞

Show inline comments

@@ @@ -24,31 +24,39 @@ Model for hg app @@
 @author: marcink
 """
 from beaker.cache import cache_region
 from mercurial import ui
 from mercurial.hgweb.hgwebdir_mod import findrepos
 from pylons import app_globals as g
 from vcs.exceptions import RepositoryError, VCSError
 from pylons_app.model.meta import Session
 from pylons_app.model.db import Repository
 import logging
 import os
 import sys
 log = logging.getLogger(__name__)
 try:
     from vcs.backends.hg import MercurialRepository
 except ImportError:
     sys.stderr.write('You have to import vcs module')
     raise Exception('Unable to import vcs')
 def _get_repos_cached_initial(app_globals):
     """
     return cached dict with repos
     """
     g = app_globals
     return HgModel.repo_scan(g.paths[0][0], g.paths[0][1], g.baseui)
 @cache_region('long_term', 'cached_repo_list')
 def _get_repos_cached():
     """
     return cached dict with repos
     """
     from pylons import app_globals as g
     return HgModel.repo_scan(g.paths[0][0], g.paths[0][1], g.baseui)
 @cache_region('long_term', 'full_changelog')
 def _full_changelog_cached(repo_name):
     log.info('getting full changelog for %s', repo_name)
     return list(reversed(list(HgModel().get_repo(repo_name))))
@@ @@ -59,22 +67,22 @@ class HgModel(object): @@
     """
     def __init__(self):
         """
         Constructor
         """
         pass
     @staticmethod
     def repo_scan(repos_prefix, repos_path, baseui):
         """
         Listing of repositories in given path. This path should not be a
         repository itself. Return a dictionary of repository objects
         :param repos_path: path to directory it could take syntax with
         * or ** for deep recursive displaying repositories
         """
         sa = Session()
         def check_repo_dir(path):
             """
             Checks the repository
             :param path:
             """
             repos_path = path.split('/')
@@ @@ -99,14 +107,19 @@ class HgModel(object): @@
             try:
                 #name = name.split('/')[-1]
                 if repos_list.has_key(name):
                     raise RepositoryError('Duplicate repository name %s found in'
                                     ' %s' % (name, path))
                 else:
                     repos_list[name] = MercurialRepository(path, baseui=baseui)
                     repos_list[name].name = name
                     dbrepo = sa.query(Repository).get(name)
                     if dbrepo:
                         repos_list[name].description = dbrepo.description
                         repos_list[name].contact = dbrepo.user.full_contact
             except OSError:
                 continue
         return repos_list
     def get_repos(self):
         for name, repo in _get_repos_cached().items():

pylons_app/model/repo_model.py

➞

Show inline comments

@@ new file 100644 @@
 #!/usr/bin/env python
 # encoding: utf-8
 # model for handling repositories actions
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
 # 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
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # 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 Jun 5, 2010
 model for handling repositories actions
 @author: marcink
 """
 from pylons_app.model.meta import Session
 from pylons_app.model.db import Repository
 import shutil
 import os
 from datetime import datetime
 from pylons_app.lib.utils import check_repo
 from pylons import app_globals as g
 import logging
 log = logging.getLogger(__name__)
 class RepoModel(object):
     def __init__(self):
         self.sa = Session()
     def get(self, id):
         return self.sa.query(Repository).get(id)
     def update(self, id, form_data):
         try:
             if id != form_data['repo_name']:
                 self.__rename_repo(id, form_data['repo_name'])
             cur_repo = self.sa.query(Repository).get(id)
             for k, v in form_data.items():
                 if k == 'user':
                     cur_repo.user_id = v
                 else:
                     setattr(cur_repo, k, v)
             self.sa.add(cur_repo)
             self.sa.commit()
         except Exception as e:
             log.error(e)
             self.sa.rollback()
             raise
     def create(self, form_data, cur_user):
         try:
             new_repo = Repository()
             for k, v in form_data.items():
                 setattr(new_repo, k, v)
             new_repo.user_id = cur_user.user_id
             self.sa.add(new_repo)
             self.sa.commit()
             self.__create_repo(form_data['repo_name'])
         except Exception as e:
             log.error(e)
             self.sa.rollback()
             raise
     def delete(self, repo):
         try:
             self.sa.delete(repo)
             self.sa.commit()
             self.__delete_repo(repo.repo_name)
         except Exception as e:
             log.error(e)
             self.sa.rollback()
             raise
     def __create_repo(self, repo_name):
         repo_path = os.path.join(g.base_path, repo_name)
         if check_repo(repo_name, g.base_path):
             log.info('creating repo %s in %s', repo_name, repo_path)
             from vcs.backends.hg import MercurialRepository
             MercurialRepository(repo_path, create=True)
     def __rename_repo(self, old, new):
         log.info('renaming repoo from %s to %s', old, new)
         old_path = os.path.join(g.base_path, old)
         new_path = os.path.join(g.base_path, new)
         shutil.move(old_path, new_path)
     def __delete_repo(self, name):
         rm_path = os.path.join(g.base_path, name)
         log.info("Removing %s", rm_path)
         #disable hg
         shutil.move(os.path.join(rm_path, '.hg'), os.path.join(rm_path, 'rm__.hg'))
         #disable repo
         shutil.move(rm_path, os.path.join(g.base_path, 'rm__%s-%s' % (datetime.today(), id)))

pylons_app/model/user_model.py

➞

Show inline comments

@@ @@ -23,12 +23,14 @@ Created on April 9, 2010 @@
 Model for users
 @author: marcink
 """
 from pylons_app.model.db import User
 from pylons_app.model.meta import Session
 import logging
 log = logging.getLogger(__name__)
 class UserModel(object):
     def __init__(self):
         self.sa = Session()
@@ @@ -40,13 +42,14 @@ class UserModel(object): @@
             new_user = User()
             for k, v in form_data.items():
                 setattr(new_user, k, v)
             self.sa.add(new_user)
             self.sa.commit()
         except:
         except Exception as e:
             log.error(e)
             self.sa.rollback()
             raise
     def update(self, id, form_data):
         try:
             new_user = self.sa.query(User).get(id)
@@ @@ -56,9 +59,19 @@ class UserModel(object): @@
                     new_user.password = v
                 else:
                     setattr(new_user, k, v)
             self.sa.add(new_user)
             self.sa.commit()
         except:
         except Exception as e:
             log.error(e)
             self.sa.rollback()
             raise
     def delete(self, id):
         try:
             self.sa.delete(self.sa.query(User).get(id))
             self.sa.commit()
         except Exception as e:
             log.error(e)
             self.sa.rollback()
             raise

pylons_app/templates/admin/repos/repo_add.html

➞

Show inline comments

@@ @@ -17,21 +17,24 @@ @@
 	<div>
         <h2>${_('Repositories')} - ${_('add new')}</h2>
         ${h.form(url('repos'))}
         <table>
         	<tr>
         		<td>${_('Name')}</td>
         		<td>${h.text('name',c.new_repo)}</td>
         		<td>${h.text('repo_name',c.new_repo)}</td>
         		<td>${self.get_form_error('repo_name')}</td>
         	</tr>
         	<tr>
         		<td>${_('Description')}</td>
         		<td>${h.textarea('description',cols=23,rows=5)}</td>
         		<td>${self.get_form_error('description')}</td>
         	</tr>
         	<tr>
         		<td>${_('Private')}</td>
         		<td>${h.checkbox('private')}</td>
         		<td>${self.get_form_error('private')}</td>
         	</tr>
         	<tr>
         		<td></td>
         		<td>${h.submit('add','add')}</td>
         	</tr>

pylons_app/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -13,25 +13,33 @@ @@
 	${self.menu('admin')}
 	${self.submenu('repos')}
 </%def>
 <%def name="main()">
 	<div>
         <h2>${_('Repositories')} - ${_('edit')}</h2>
-        ${h.form(url('repo', id=c.new_repo),method='put')}
+        ${h.form(url('repo', id=c.repo_info.repo_name),method='put')}
         <table>
         	<tr>
         		<td>${_('Name')}</td>
         		<td>${h.text('name',c.new_repo)}</td>
         		<td>${h.text('repo_name')}</td>
         		<td>${self.get_form_error('repo_name')}</td>
         	</tr>
         	<tr>
         		<td>${_('Description')}</td>
         		<td>${h.textarea('description',cols=23,rows=5)}</td>
         		<td>${self.get_form_error('description')}</td>
         	</tr>
         	<tr>
         		<td>${_('Private')}</td>
         		<td>${h.checkbox('private')}</td>
         		<td>${self.get_form_error('private')}</td>
         	</tr>
         	<tr>
         		<td>${_('Owner')}</td>
         		<td>${h.text('user')}</td>
         		<td>${self.get_form_error('user')}</td>
         	</tr>
         	<tr>
         		<td></td>
         		<td>${h.submit('update','update')}</td>
         	</tr>

pylons_app/templates/summary/summary.html

➞

Show inline comments

@@ @@ -67,13 +67,13 @@ E.onDOMReady(function(e){ @@
 	%for cnt,cs in enumerate(c.repo_changesets):
 		<tr class="parity${cnt%2}">
 			<td>${cs._ctx.date()|n,filters.age}</td>
 			<td>${cs.author|n,filters.person}</td>
 			<td>r${cs.revision}</td>
 			<td>
 				${h.link_to(truncate(cs.message,60),
+				${h.link_to(h.truncate(cs.message,60),
 				h.url('changeset_home',repo_name=c.repo_name,revision=cs._short),
 				title=cs.message)}
 			</td>
 			<td>
 				<span class="logtags">
 					<span class="branchtag">${cs.branch}</span>

0 comments (0 inline, 0 general)