kallithea Changeset - 7c541dc095c8

Changeset - 7c541dc095c8

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Mads Kiilerich (mads) - 5 years ago 2020-11-13 00:38:39
mads@kiilerich.com

Grafted from: 9e0a834e1f96

lib: clean up pointless use of h.person on db.User just to get .username

After cleaning up, h.person will never be invoked with a db.User .

7 files changed with 8 insertions and 15 deletions:

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/admin/user_groups.py

kallithea/lib/helpers.py

kallithea/model/repo.py

kallithea/templates/admin/gists/index.html

kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html

kallithea/templates/admin/user_groups/user_group_edit_advanced.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -118,13 +118,13 @@ class RepoGroupsController(BaseControlle @@
             repo_count = repo_gr.repositories.count()
             repo_groups_data.append({
                 "raw_name": webutils.escape(repo_gr.group_name),
                 "group_name": repo_group_name(repo_gr.group_name, children_groups),
                 "desc": webutils.escape(repo_gr.group_description),
                 "repos": repo_count,
-                "owner": h.person(repo_gr.owner),
+                "owner": repo_gr.owner.username,
                 "action": repo_group_actions(repo_gr.group_id, repo_gr.group_name,
                                              repo_count)
             })
         c.data = {
             "sort": None,

kallithea/controllers/admin/user_groups.py

➞

Show inline comments

@@ @@ -100,13 +100,13 @@ class UserGroupsController(BaseControlle @@
                 "raw_name": user_gr.users_group_name,
                 "group_name": user_group_name(user_gr.users_group_id,
                                               user_gr.users_group_name),
                 "desc": webutils.escape(user_gr.user_group_description),
                 "members": len(user_gr.members),
                 "active": h.boolicon(user_gr.users_group_active),
-                "owner": h.person(user_gr.owner.username),
                 "owner": user_gr.owner.username,
                 "action": user_group_actions(user_gr.users_group_id, user_gr.users_group_name)
             })
         c.data = {
             "sort": None,
             "dir": "asc",

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -401,18 +401,14 @@ def email_or_none(author): @@
     # No valid email, not a valid user in the system, none!
     return None
 def person(author, show_attr="username"):
     """Find the user identified by 'author', return one of the users attributes,
+    """Find the user identified by 'author' string, return one of the users attributes,
     default to the username attribute, None if there is no user"""
     # if author is already an instance use it for extraction
     if isinstance(author, db.User):
         return getattr(author, show_attr)
     value = user_attr_or_none(author, show_attr)
     if value is not None:
         return value
     # Still nothing?  Just pass back the author name if any, else the email
     return author_name(author) or author_email(author)

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -113,14 +113,12 @@ class RepoModel(object): @@
         admin: return data for action column.
         """
         _render = self._render_datatable
         from tg import request
         from tg import tmpl_context as c
         import kallithea.lib.helpers as h
         def repo_lnk(name, rtype, rstate, private, fork_of):
             return _render('repo_name', name, rtype, rstate, private, fork_of,
                            short_name=short_name)
         def following(repo_id, is_following):
             return _render('following', repo_id, is_following)
@@ @@ -175,22 +173,21 @@ class RepoModel(object): @@
                 ),
                 "last_change_iso": repo.last_db_change.isoformat(),
                 "last_change": last_change(repo.last_db_change),
                 "last_changeset": last_rev(repo.repo_name, cs_cache),
                 "last_rev_raw": cs_cache.get('revision'),
                 "desc": desc(repo.description),
-                "owner": h.person(repo.owner),
+                "owner": repo.owner.username,
                 "state": state(repo.repo_state),
                 "rss": rss_lnk(repo.repo_name),
                 "atom": atom_lnk(repo.repo_name),
+            }
             if admin:
                 row.update({
                     "action": repo_actions(repo.repo_name),
                     "owner": owner_actions(repo.owner_id,
                                            h.person(repo.owner))
                     "owner": owner_actions(repo.owner_id, repo.owner.username)
                 })
             repos_data.append(row)
         return {
             "sort": "name",
             "dir": "asc",

kallithea/templates/admin/gists/index.html

➞

Show inline comments

@@ @@ -41,13 +41,13 @@ @@
     <div class="panel-body">
       %if c.gists_pager.item_count>0:
         % for gist in c.gists_pager:
           <div class="gist-item clearfix">
             ${h.gravatar_div(gist.owner.email, size=28)}
             <span title="${gist.owner.full_contact}" class="user">
-                <b>${h.person(gist.owner.full_contact)}</b> /
+                <b>${gist.owner.username}</b> /
                 <b><a href="${h.url('gist',gist_id=gist.gist_access_id)}">gist: ${gist.gist_access_id}</a></b>
             </span>
             <div>
                 ${_('Created')} ${h.age(gist.created_on)} /
                 <span class="text-muted">
                   %if gist.gist_expires == -1:

kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
 <%
  elems = [
     (_('Top level repositories'), c.repo_group.repositories.count(), ''),
     (_('Total repositories'), c.repo_group.repositories_recursive_count, ''),
     (_('Children groups'), c.repo_group.children.count(), ''),
     (_('Created on'), h.fmt_date(c.repo_group.created_on), ''),
-    (_('Owner'), h.person(c.repo_group.owner), ''),
+    (_('Owner'), c.repo_group.owner.username, ''),
+ ]
 %>
 %for dt, dd, tt in elems:
   <dt>${dt}:</dt>
   <dd title="${tt}">${dd}</dd>
 %endfor

kallithea/templates/admin/user_groups/user_group_edit_advanced.html

➞

Show inline comments

@@ @@ -2,13 +2,13 @@ @@
 <dl class="dl-horizontal">
 <%
  elems = [
     (_('Members'), len(c.group_members_obj), ''),
     (_('Created on'), h.fmt_date(c.user_group.created_on), ''),
-    (_('Owner'), h.person(c.user_group.owner), ''),
+    (_('Owner'), c.user_group.owner.username, ''),
+    ]
 %>
 %for dt, dd, tt in elems:
   <dt>${dt}:</dt>
   <dd title="${tt}">${dd}</dd>
 %endfor

0 comments (0 inline, 0 general)