Download as
Browse Code »

Commit 8778b84596f3714add101a82444b7feb1338ad04

Authored by Luan
2 parents dd792dc6 966ab4e4
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

Merge branch 'master' of github.com:TracyWebTech/colab

Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
src/super_archives/templates/message-thread.html
  Diff comments   View file @8778b84
@@ -95,7 +95,9 @@ @@ -95,7 +95,9 @@
95 }); 95 });
96 96
97 $('.vote.btn', this).on('click', vote); 97 $('.vote.btn', this).on('click', vote);
98 - $('.reply.btn', this).on('click', focus_reply); 98 + {% if user.is_active %}
  99 + $('.reply.btn', this).on('click', focus_reply);
  100 + {% endif %}
99 }); 101 });
100 102
101 </script> 103 </script>
src/templates/home.html
  Diff comments   View file @8778b84
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 {% include "message-preview.html" with result=thread.latest_message %} 72 {% include "message-preview.html" with result=thread.latest_message %}
73 {% endfor %} 73 {% endfor %}
74 </ul> 74 </ul>
75 - <a href="{% url 'haystack_search' %}?type=thread&order=latest"> 75 + <a href="{% url 'haystack_search' %}?type=thread&amp;order=latest">
76 {% trans "View more discussions..." %} 76 {% trans "View more discussions..." %}
77 </a> 77 </a>
78 <div>&nbsp;</div> 78 <div>&nbsp;</div>