kallithea Changeset - 88d13c1c6a55

Changeset - 88d13c1c6a55

Parent rev.

Child rev.

[Not reviewed]

beta

1 5 0

Marcin Kuzminski - 14 years ago 2011-07-20 01:47:56
marcin@python-works.com

removed users_group controller in replace for model methods,
fixed tests

6 files changed with 148 insertions and 141 deletions:

rhodecode/controllers/admin/users_groups.py

rhodecode/model/db.py

rhodecode/model/users_group.py

105

rhodecode/templates/changelog/changelog.html

rhodecode/tests/functional/test_admin_users_groups.py

rhodecode/tests/functional/test_changelog.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/users_groups.py

➞

Show inline comments

@@ @@ -36,13 +36,12 @@ from rhodecode.lib.exceptions import Use @@
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import User, UsersGroup, Permission, UsersGroupToPerm
 from rhodecode.model.forms import UserForm, UsersGroupForm
 from rhodecode.model.users_group import UsersGroupModel
 log = logging.getLogger(__name__)
 class UsersGroupsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
@@ @@ -64,17 +63,17 @@ class UsersGroupsController(BaseControll @@
         c.users_groups_list = self.sa.query(UsersGroup).all()
         return render('admin/users_groups/users_groups.html')
     def create(self):
         """POST /users_groups: Create a new item"""
         # url('users_groups')
-        users_group_model = UsersGroupModel()
         users_group_form = UsersGroupForm()()
         try:
             form_result = users_group_form.to_python(dict(request.POST))
-            users_group_model.create(form_result)
+            UsersGroup.create(form_result)
             h.flash(_('created users group %s') \
                     % form_result['users_group_name'], category='success')
             #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa)
         except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/users_groups/users_group_add.html'),
@@ @@ -100,27 +99,26 @@ class UsersGroupsController(BaseControll @@
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('users_group', id=ID),
         #           method='put')
         # url('users_group', id=ID)
         users_group_model = UsersGroupModel()
         c.users_group = users_group_model.get(id)
         c.users_group = UsersGroup.get(id)
         c.group_members = [(x.user_id, x.user.username) for x in
                            c.users_group.members]
         c.available_members = [(x.user_id, x.username) for x in
                                self.sa.query(User).all()]
         users_group_form = UsersGroupForm(edit=True,
                                           old_data=c.users_group.get_dict(),
                                           available_members=[str(x[0]) for x
                                                 in c.available_members])()
         try:
             form_result = users_group_form.to_python(request.POST)
-            users_group_model.update(id, form_result)
+            UsersGroup.update(id, form_result)
             h.flash(_('updated users group %s') \
                         % form_result['users_group_name'],
                     category='success')
             #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa)
         except formencode.Invalid, errors:
             e = errors.error_dict or {}
@@ @@ -147,15 +145,15 @@ class UsersGroupsController(BaseControll @@
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('users_group', id=ID),
         #           method='delete')
         # url('users_group', id=ID)
-        users_group_model = UsersGroupModel()
         try:
-            users_group_model.delete(id)
+            UsersGroup.delete(id)
             h.flash(_('successfully deleted users group'), category='success')
         except UsersGroupsAssignedException, e:
             h.flash(e, category='error')
         except Exception:
             h.flash(_('An error occurred during deletion of users group'),
                     category='error')

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -39,12 +39,13 @@ from beaker.cache import cache_region, r @@
 from vcs import get_backend
 from vcs.utils.helpers import get_scm
 from vcs.exceptions import RepositoryError, VCSError
 from vcs.utils.lazy import LazyProperty
 from vcs.nodes import FileNode
 from rhodecode.lib.exceptions import UsersGroupsAssignedException
 from rhodecode.lib import str2bool, json, safe_str
 from rhodecode.model.meta import Base, Session
 from rhodecode.model.caching_query import FromCache
 log = logging.getLogger(__name__)
@@ @@ -299,12 +300,83 @@ class UsersGroup(Base, BaseModel): @@
                 .filter(UsersGroup.users_group_name == group_name)
         if cache:
             gr = gr.options(FromCache("sql_cache_short",
                                           "get_user_%s" % group_name))
         return gr.scalar()
     @classmethod
     def get(cls, users_group_id, cache=False):
         users_group = Session.query(cls)
         if cache:
             users_group = users_group.options(FromCache("sql_cache_short",
                                     "get_users_group_%s" % users_group_id))
         return users_group.get(users_group_id)
     @classmethod
     def create(cls, form_data):
         try:
             new_users_group = cls()
             for k, v in form_data.items():
                 setattr(new_users_group, k, v)
             Session.add(new_users_group)
             Session.commit()
         except:
             log.error(traceback.format_exc())
             Session.rollback()
             raise
     @classmethod
     def update(cls, users_group_id, form_data):
         try:
             users_group = cls.get(users_group_id, cache=False)
             for k, v in form_data.items():
                 if k == 'users_group_members':
                     users_group.members = []
                     Session.flush()
                     members_list = []
                     if v:
                         for u_id in set(v):
                             members_list.append(UsersGroupMember(
                                                             users_group_id,
                                                             u_id))
                     setattr(users_group, 'members', members_list)
                 setattr(users_group, k, v)
             Session.add(users_group)
             Session.commit()
         except:
             log.error(traceback.format_exc())
             Session.rollback()
             raise
     @classmethod
     def delete(cls, users_group_id):
         try:
             # check if this group is not assigned to repo
             assigned_groups = UsersGroupRepoToPerm.query()\
                 .filter(UsersGroupRepoToPerm.users_group_id ==
                         users_group_id).all()
             if assigned_groups:
                 raise UsersGroupsAssignedException('Group assigned to %s' %
                                                    assigned_groups)
             users_group = cls.get(users_group_id, cache=False)
             Session.delete(users_group)
             Session.commit()
         except:
             log.error(traceback.format_exc())
             Session.rollback()
             raise
 class UsersGroupMember(Base, BaseModel):
     __tablename__ = 'users_groups_members'
     __table_args__ = {'extend_existing':True}
     users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)

rhodecode/model/users_group.py

➞

Show inline comments

deleted file

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -57,16 +57,13 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 								<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>
 							</div>
 							<div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 						</div>
 						<div class="right">
 									<div id="${cs.raw_id}_changes_info" class="changes">
                                         <span id="${cs.raw_id}" class="changed_total tooltip"
                                         title="${_('Affected number of files, click to show more details')}">
                                         ${len(cs.affected_files)}
                                         </span>
                                         <span id="${cs.raw_id}" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</span>
 									</div>
 										%if len(cs.parents)>1:
 										<div class="merge">
 											${_('merge')}<img alt="merge" src="${h.url('/images/icons/arrow_join.png')}"/>
 										</div>
 										%endif

rhodecode/tests/functional/test_admin_users_groups.py

➞

Show inline comments

 from rhodecode.tests import *
 from rhodecode.model.db import UsersGroup
 TEST_USERS_GROUP = 'admins_test'
 class TestAdminUsersGroupsController(TestController):
     def test_index(self):
@@ @@ -33,19 +34,43 @@ class TestAdminUsersGroupsController(Tes @@
         response = self.app.get(url('formatted_new_users_group', format='xml'))
     def test_update(self):
         response = self.app.put(url('users_group', id=1))
     def test_update_browser_fakeout(self):
         response = self.app.post(url('users_group', id=1), params=dict(_method='put'))
         response = self.app.post(url('users_group', id=1),
                                  params=dict(_method='put'))
     def test_delete(self):
         response = self.app.delete(url('users_group', id=1))
         self.log_user()
         users_group_name = TEST_USERS_GROUP + 'another'
         response = self.app.post(url('users_groups'),
                                  {'users_group_name':users_group_name,
                                   'active':True})
         response.follow()
         self.checkSessionFlash(response,
                                'created users group %s' % users_group_name)
         gr = self.sa.query(UsersGroup)\
                            .filter(UsersGroup.users_group_name ==
                                    users_group_name).one()
         response = self.app.delete(url('users_group', id=gr.users_group_id))
         gr = self.sa.query(UsersGroup)\
                            .filter(UsersGroup.users_group_name ==
                                    users_group_name).scalar()
         self.assertEqual(gr, None)
     def test_delete_browser_fakeout(self):
         response = self.app.post(url('users_group', id=1), params=dict(_method='delete'))
         response = self.app.post(url('users_group', id=1),
                                  params=dict(_method='delete'))
     def test_show(self):
         response = self.app.get(url('users_group', id=1))
     def test_show_as_xml(self):
         response = self.app.get(url('formatted_users_group', id=1, format='xml'))

rhodecode/tests/functional/test_changelog.py

➞

Show inline comments

 from rhodecode.tests import *
 class TestChangelogController(TestController):
     def test_index_hg(self):
         self.log_user()
         response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO))
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO))
         assert """<div id="chg_20" class="container">""" in response.body, 'wrong info about number of changes'
         assert """<input class="changeset_range" id="5e204e7583b9" name="5e204e7583b9" type="checkbox" value="1" />""" in response.body, 'no checkbox for this commit'
         assert """<span>commit 154: 5e204e7583b9@2010-08-10 01:18:46</span>""" in response.body , 'no info on this commit'
         assert """Small update at simplevcs app""" in response.body, 'missing info about commit message'
         self.assertTrue("""<div id="chg_20" class="container">"""
                         in response.body)
         self.assertTrue("""<input class="changeset_range" id="5e204e7583b9" """
                         """name="5e204e7583b9" type="checkbox" value="1" />"""
                         in response.body)
         self.assertTrue("""<span>commit 154: 5e204e7583b9@2010-08-10 """
                         """01:18:46</span>""" in response.body)
         self.assertTrue("""Small update at simplevcs app""" in response.body)
         assert """<span class="removed tooltip" title="<b>removed</b>: No Files">0</span>""" in response.body, 'wrong info about removed nodes'
         assert """<span class="changed tooltip" title="<b>changed</b>: <br/> vcs/backends/hg.py<br/> vcs/web/simplevcs/models.py">2</span>""" in response.body, 'wrong info about changed nodes'
         assert """<span class="added tooltip" title="<b>added</b>: <br/> vcs/web/simplevcs/managers.py">1</span>""" in response.body, 'wrong info about added nodes'
         self.assertTrue("""<span id="5e204e7583b9c8e7b93a020bd036564b1e"""
                         """731dae" class="changed_total tooltip" """
                         """title="Affected number of files, click to """
                         """show more details">3</span>""" in response.body)
         #pagination
         response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO), {'page':1})
         response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO), {'page':2})
         response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO), {'page':3})
         response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO), {'page':4})
         response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO), {'page':5})
         response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO), {'page':6})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':1})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':2})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':3})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':4})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':5})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':6})
         # Test response after pagination...
         print response.body
         assert """<input class="changeset_range" id="46ad32a4f974" name="46ad32a4f974" type="checkbox" value="1" />""" in response.body, 'no checkbox for this commit'
         assert """<span>commit 64: 46ad32a4f974@2010-04-20 00:33:21</span>"""in response.body, 'wrong info about commit 64'
         assert """<span class="removed tooltip" title="<b>removed</b>: <br/> docs/api.rst">1</span>"""in response.body, 'wrong info about number of removed'
         assert """<span class="changed tooltip" title="<b>changed</b>: <br/> .hgignore<br/> README.rst<br/> docs/conf.py<br/> docs/index.rst<br/> setup.py<br/> tests/test_hg.py<br/> tests/test_nodes.py<br/> vcs/__init__.py<br/> vcs/backends/__init__.py<br/> vcs/backends/base.py<br/> vcs/backends/hg.py<br/> vcs/nodes.py<br/> vcs/utils/__init__.py">13</span>"""in response.body, 'wrong info about number of changes'
         assert """<span class="added tooltip" title="<b>added</b>: <br/> docs/api/backends/hg.rst<br/> docs/api/backends/index.rst<br/> docs/api/index.rst<br/> docs/api/nodes.rst<br/> docs/api/web/index.rst<br/> docs/api/web/simplevcs.rst<br/> docs/installation.rst<br/> docs/quickstart.rst<br/> setup.cfg<br/> vcs/utils/baseui_config.py<br/> vcs/utils/web.py<br/> vcs/web/__init__.py<br/> vcs/web/exceptions.py<br/> vcs/web/simplevcs/__init__.py<br/> vcs/web/simplevcs/exceptions.py<br/> vcs/web/simplevcs/middleware.py<br/> vcs/web/simplevcs/models.py<br/> vcs/web/simplevcs/settings.py<br/> vcs/web/simplevcs/utils.py<br/> vcs/web/simplevcs/views.py">20</span>"""in response.body, 'wrong info about number of added'
         assert """<div class="message"><a href="/%s/changeset/46ad32a4f974e45472a898c6b0acb600320579b1">Merge with 2e6a2bf9356ca56df08807f4ad86d480da72a8f4</a></div>""" % HG_REPO in response.body, 'wrong info about commit 64 is a merge'
         self.assertTrue("""<input class="changeset_range" id="46ad32a4f974" """
                         """name="46ad32a4f974" type="checkbox" value="1" />"""
                         in response.body)
         self.assertTrue("""<span>commit 64: 46ad32a4f974@2010-04-20"""
                         """ 00:33:21</span>"""in response.body)
         self.assertTrue("""<span id="46ad32a4f974e45472a898c6b0acb600320"""
                         """579b1" class="changed_total tooltip" """
                         """title="Affected number of files, click to """
                         """show more details">21</span>"""in response.body)
         self.assertTrue("""<div class="message"><a href="/%s/changeset/"""
                         """46ad32a4f974e45472a898c6b0acb600320579b1">"""
                         """Merge with 2e6a2bf9356ca56df08807f4ad86d48"""
                         """0da72a8f4</a></div>""" % HG_REPO in response.body)
     #def test_index_git(self):
     #    self.log_user()
     #    response = self.app.get(url(controller='changelog', action='index', repo_name=GIT_REPO))

0 comments (0 inline, 0 general)