alexbevi / redmine_knowledgebase

A knowledgebase plugin for Redmine
452 stars 199 forks source link

Watcher Probrem #348

Open crosspoints opened 6 years ago

crosspoints commented 6 years ago

I found the probrem of watcher. So I made this patch.

--- redmine_knowledgebase-master/app/views/articles/show.html.erb       2017-11-19 22:57:32.000000000 +0900
+++ redmine_knowledgebase/app/views/articles/show.html.erb      2018-01-11 16:13:19.261609100 +0900
@@ -18,8 +18,9 @@
   <% end %>

                <li><%= link_to_if_authorized l(:label_new_comment), { :controller => "articles", :action => "comment",
:article_id => @article.id, :project_id => @project}, :class => "icon icon-comment", :remote => true, :method => :get %>
</li>
+               <li> <%= watcher_link(@article, User.current) %></li>
                <li>
-      <%= render :partial => 'watchers/watchers', :locals => {:watched => @article} %>
+      <%= render :partial => 'articles/watchers', :locals => {:watched => @article} %>
     </li>
        </ul>
        <br />
diff -uprN redmine_knowledgebase-master/app/views/categories/show.html.erb redmine_knowledgebase/app/views/categories/sh
ow.html.erb
--- redmine_knowledgebase-master/app/views/categories/show.html.erb     2017-11-19 22:57:32.000000000 +0900
+++ redmine_knowledgebase/app/views/categories/show.html.erb    2018-01-11 16:13:19.385997800 +0900
@@ -20,7 +20,8 @@
     <li><%= link_to_if_authorized l(:label_new_category), { :controller => 'categories', :action => 'new', :parent_id =
> @category.id, :project_id => @project}, :class => 'icon icon-add' %></li>
     <li><%= link_to_if_authorized l(:label_edit_category), { :controller => 'categories', :action => 'edit', :id => @ca
tegory.id, :project_id => @project}, :class => 'icon icon-edit' %></li>
     <li><%= link_to_if_authorized l(:label_delete_category), { :controller => 'categories', :action => 'destroy', :id =
> @category.id, :project_id => @project}, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-de
l' %></li>              <li>
-      <%= render :partial => 'watchers/watchers', :locals => {:watched => @category} %>
+    <li><%= watcher_link(@category, User.current) %></li>
+      <%= render :partial => 'categories/watchers', :locals => {:watched => @category} %>
     </li>
        </ul>
        <h3><%= l(:title_browse_by_category) %></h3>
robspearman commented 6 years ago

Good catch! But I need either a non-adulterated patch file that I can apply or a pull request.

Thanks!

alexbevi commented 6 years ago

@crosspoints are you able to resubmit this as a PR?