0001_move_watchers_to_issues_content_area.diff

Bernhard Rohloff, 2019-01-28 15:38

Download (1.48 KB)

View differences:

app/views/issues/show.html.erb (Arbeitskopie)
117 117
<%= render :partial => 'relations' %>
118 118
</div>
119 119
<% end %>
120
<% if User.current.allowed_to?(:add_issue_watchers, @project) ||
121
    (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
122
  <hr />
123
  <div id="watchers">
124
    <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
125
  </div>
126
<% end %>
120 127

  
121 128
</div>
122 129

  
......
148 155
<% content_for :sidebar do %>
149 156
  <%= render :partial => 'issues/sidebar' %>
150 157

  
151
  <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
152
    (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
153
    <div id="watchers">
154
      <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
155
    </div>
156
  <% end %>
157 158
<% end %>
158 159

  
159 160
<% content_for :header_tags do %>
app/views/watchers/_watchers.html.erb (Arbeitskopie)
7 7
</div>
8 8
<% end %>
9 9

  
10
<h3><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</h3>
10
<p><strong><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</strong></p>
11 11

  
12 12
<%= watchers_list(watched) %>