kallithea Changeset - 19de74e33fb0

Changeset - 19de74e33fb0

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2012-07-02 00:22:57
marcin@python-works.com

Better descriptions of given permission overview in edit user view

4 files changed with 33 insertions and 28 deletions:

rhodecode/lib/db_manage.py

rhodecode/lib/helpers.py

rhodecode/model/db.py

rhodecode/templates/admin/users/user_edit.html

0 comments (0 inline, 0 general)

rhodecode/lib/db_manage.py

➞

Show inline comments

@@ @@ -476,39 +476,18 @@ class DbManage(object): @@
                               email='anonymous@rhodecode.org',
                               firstname='Anonymous', lastname='User')
     def create_permissions(self):
         # module.(access|create|change|delete)_[name]
         # module.(none|read|write|admin)
         perms = [
          ('repository.none', 'Repository no access'),
          ('repository.read', 'Repository read access'),
          ('repository.write', 'Repository write access'),
          ('repository.admin', 'Repository admin access'),
          ('group.none', 'Repositories Group no access'),
          ('group.read', 'Repositories Group read access'),
          ('group.write', 'Repositories Group write access'),
          ('group.admin', 'Repositories Group admin access'),
          ('hg.admin', 'Hg Administrator'),
          ('hg.create.repository', 'Repository create'),
          ('hg.create.none', 'Repository creation disabled'),
          ('hg.register.none', 'Register disabled'),
          ('hg.register.manual_activate', 'Register new user with RhodeCode '
                                          'without manual activation'),
          ('hg.register.auto_activate', 'Register new user with RhodeCode '
                                         'without auto activation'),
+        ]
         for p in perms:
         for p in Permission.PERMS:
             if not Permission.get_by_key(p[0]):
                 new_perm = Permission()
                 new_perm.permission_name = p[0]
-                new_perm.permission_longname = p[1]
+                new_perm.permission_longname = p[0]
                 self.sa.add(new_perm)
     def populate_default_permissions(self):
         log.info('creating default user permissions')
         default_user = self.sa.query(User)\

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -43,13 +43,13 @@ from rhodecode.lib.utils2 import str2boo @@
     get_changeset_safe
 from rhodecode.lib.markup_renderer import MarkupRenderer
 from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError
 from rhodecode.lib.vcs.backends.base import BaseChangeset
 from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.db import URL_SEP
+from rhodecode.model.db import URL_SEP, Permission
 log = logging.getLogger(__name__)
 html_escape_table = {
     "&": "&amp;",
@@ @@ -1004,6 +1004,10 @@ def rst_w_mentions(source): @@
 def changeset_status(repo, revision):
     return ChangesetStatusModel().get_status(repo, revision)
 def changeset_status_lbl(changeset_status):
     return dict(ChangesetStatus.STATUSES).get(changeset_status)
 def get_permission_name(key):
     return dict(Permission.PERMS).get(key)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -1055,12 +1055,34 @@ class Permission(Base, BaseModel): @@
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
+    )
     PERMS = [
         ('repository.none', _('Repository no access')),
         ('repository.read', _('Repository read access')),
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
         ('group.none', _('Repositories Group no access')),
         ('group.read', _('Repositories Group read access')),
         ('group.write', _('Repositories Group write access')),
         ('group.admin', _('Repositories Group admin access')),
         ('hg.admin', _('RhodeCode Administrator')),
         ('hg.create.none', _('Repository creation disabled')),
         ('hg.create.repository', _('Repository creation enabled')),
         ('hg.register.none', _('Register disabled')),
         ('hg.register.manual_activate', _('Register new user with RhodeCode '
                                           'with manual activation')),
         ('hg.register.auto_activate', _('Register new user with RhodeCode '
                                         'with auto activation')),
+    ]
     permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     permission_name = Column("permission_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     permission_longname = Column("permission_longname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (

rhodecode/templates/admin/users/user_edit.html

➞

Show inline comments

@@ @@ -183,31 +183,31 @@ @@
                         <td>
                             %if section == 'repositories':
                                 <a href="${h.url('summary_home',repo_name=k)}">${k}</a>
                             %elif section == 'repositories_groups':
                                 <a href="${h.url('repos_group_home',group_name=k)}">${k}</a>
                             %else:
                                 ${k}
+                                ${h.get_permission_name(k)}
                             %endif
                         </td>
                         <td>
                             %if section == 'global':
-                             ${h.bool2icon(True)}
+                             ${h.bool2icon(k.split('.')[-1] != 'none')}
                             %else:
                             <span class="perm_tag ${_perm}">${section_perm}</span>
+                             <span class="perm_tag ${_perm}">${section_perm}</span>
                             %endif
                          </td>
                     </tr>
                 %endfor
                 </tbody>
                </table>
               </div>
            %endfor
     </div>
 </div>
-<div class="box box-right">
+<div class="box box-left">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Email addresses')}</h5>
     </div>
     <div class="emails_wrap">

0 comments (0 inline, 0 general)