kallithea Changeset - c597adba8459

Changeset - c597adba8459

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com

users: by default show only 'username' for known users - there is often not much space and the full name would be truncated and not unique

3 files changed with 4 insertions and 4 deletions:

kallithea/lib/helpers.py

kallithea/templates/changeset/changeset.html

kallithea/tests/functional/test_admin_gists.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -494,13 +494,13 @@ def email_or_none(author): @@
         return user.email
     # No valid email, not a valid user in the system, none!
     return None
-def person(author, show_attr="username_and_name"):
+def person(author, show_attr="username"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)
     # if author is already an instance use it for extraction
     if isinstance(author, User):
         return person_getter(author)
@@ @@ -520,13 +520,13 @@ def person(author, show_attr="username_a @@
         return person_getter(user)
     # Still nothing?  Just pass back the author name if any, else the email
     return _author or _email
-def person_by_id(id_, show_attr="username_and_name"):
+def person_by_id(id_, show_attr="username"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)
     #maybe it's an ID ?
     if str(id_).isdigit() or isinstance(id_, int):
         id_ = int(id_)

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -110,13 +110,13 @@ ${self.repo_context_bar('changelog', c.c @@
                 </div>
                 <div class="left">
                      <div class="author">
                          <div class="gravatar">
                              <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.changeset.author),20)}"/>
                          </div>
                          <span><b>${h.person(c.changeset.author)}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/>
+                         <span><b>${h.person(c.changeset.author,'username_and_name')}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/>
                          <span>${h.email_or_none(c.changeset.author)}</span><br/>
                      </div>
                      <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div>
                 </div>
             </div>
             <div class="changes_txt">

kallithea/tests/functional/test_admin_gists.py

➞

Show inline comments

@@ @@ -148,13 +148,13 @@ class TestGistsController(TestController @@
         response = self.app.delete(url('gist', gist_id=gist.gist_id), status=403)
     def test_show(self):
         gist = _create_gist('gist-show-me')
         response = self.app.get(url('gist', gist_id=gist.gist_access_id))
         response.mustcontain('added file: gist-show-me<')
-        response.mustcontain('test_admin (Kallithea Admin) - created')
         response.mustcontain('test_admin - created')
         response.mustcontain('gist-desc')
         response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>')
     def test_show_as_raw(self):
         gist = _create_gist('gist-show-me', content='GIST CONTENT')
         response = self.app.get(url('formatted_gist',

0 comments (0 inline, 0 general)