Download as
Browse Code »

Commit 42b46a413c4936c8db61798325f310168fb9f2cc

Authored by Luan
1 parent 20a0d240
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

minor fix of #127

Showing 1 changed file with 4 additions and 6 deletions   Show diff stats
src/super_archives/templates/message-preview.html
  Diff comments   View file @42b46a4
@@ -48,6 +48,8 @@ @@ -48,6 +48,8 @@
48 {{ result.modified_by }} 48 {{ result.modified_by }}
49 {% endif %} 49 {% endif %}
50 </a> 50 </a>
  51 + {% elif result.modified_by and not result.modified_by_url %}
  52 + <span>{{ result.modified_by }}</span>
51 {% elif result.fullname and result.author_url %} 53 {% elif result.fullname and result.author_url %}
52 <a href="{{ result.author_url }}"> 54 <a href="{{ result.author_url }}">
53 {% if query %} 55 {% if query %}
@@ -57,18 +59,14 @@ @@ -57,18 +59,14 @@
57 {% endif %} 59 {% endif %}
58 </a> 60 </a>
59 {% else %} 61 {% else %}
60 - {% if result.modified_by %}  
61 - <span>{{ result.modified_by }}</span>  
62 - {% else %}  
63 - <span>{{ result.fullname }}</span>  
64 - {% endif %} 62 + <span>{{ result.fullname }}</span>
65 {% endif %} 63 {% endif %}
66 </span> 64 </span>
67 {% else %} 65 {% else %}
68 <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span> 66 <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span>
69 {% endif %} 67 {% endif %}
70 {% if result.modified %} 68 {% if result.modified %}
71 - <span class="pull-right">{{ result.modified|localtime|timesince }} {% trans "ago" %}</span> 69 + <span class="pull-right">{{ result.modified|localtime|timesince }} {% trans "ago" %}</span>
72 {% endif %} 70 {% endif %}
73 </div> 71 </div>
74 {% endif %} 72 {% endif %}