kallithea Changeset - f6658c70eeeb

Changeset - f6658c70eeeb

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-01-28 19:02:02
marcin@python-works.com

#56 fixed relationship query behavior to speed up fetching, and
added tooltip showing group members

3 files changed with 3 insertions and 4 deletions:

rhodecode/controllers/admin/users_groups.py

rhodecode/model/db.py

rhodecode/templates/admin/users_groups/users_groups.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/users_groups.py

➞

Show inline comments

@@ @@ -170,13 +170,12 @@ class UsersGroupsController(BaseControll @@
         if not c.users_group:
             return redirect(url('users_groups'))
         c.users_group.permissions = {}
         c.group_members = [(x.user_id, x.user.username) for x in
                            c.users_group.members]
         print c.group_members, 'x' * 100
         c.available_members = [(x.user_id, x.username) for x in
                                self.sa.query(User).all()]
         defaults = c.users_group.get_dict()
         return htmlfill.render(
             render('admin/users_groups/users_group_edit.html'),

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -159,23 +159,23 @@ class UsersGroup(Base, BaseModel): @@
     __table_args__ = {'useexisting':True}
     users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_name = Column("users_group_name", String(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
     users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
     members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan")
+    members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
 class UsersGroupMember(Base, BaseModel):
     __tablename__ = 'users_groups_members'
     __table_args__ = {'useexisting':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)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     user = relationship('User')
+    user = relationship('User', lazy='joined')
     users_group = relationship('UsersGroup')
     def __init__(self, gr_id, u_id):
         self.users_group_id = gr_id
         self.user_id = u_id

rhodecode/templates/admin/users_groups/users_groups.html

➞

Show inline comments

@@ @@ -34,13 +34,13 @@ @@
             <th class="left">${_('active')}</th>
             <th class="left">${_('action')}</th>
         </tr>
             %for cnt,u_group in enumerate(c.users_groups_list):
                 <tr class="parity${cnt%2}">
                     <td>${h.link_to(u_group.users_group_name,h.url('edit_users_group', id=u_group.users_group_id))}</td>
                     <td>${len(u_group.members)}</td>
+                    <td><span class="tooltip" title="${', '.join([x.user.username for x in u_group.members[:50]])}">${len(u_group.members)}</span></td>
                     <td>${h.bool2icon(u_group.users_group_active)}</td>
                     <td>
                         ${h.form(url('users_group', id=u_group.users_group_id),method='delete')}
                             ${h.submit('remove_','delete',id="remove_group_%s" % u_group.users_group_id,
                             class_="delete_icon action_button",onclick="return confirm('Confirm to delete this users group');")}
                         ${h.end_form()}

0 comments (0 inline, 0 general)