##// END OF EJS Templates
Removed ProjectsController#feeds. This view was incomplete and inconsistent with permissions....
Jean-Philippe Lang -
r776:50096526bcb0
parent child
Show More
@@ -580,11 +580,6 class ProjectsController < ApplicationController
580 render :template => "projects/gantt.rhtml"
580 render :template => "projects/gantt.rhtml"
581 end
581 end
582 end
582 end
583
584 def feeds
585 @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
586 @key = User.current.rss_key
587 end
588
583
589 private
584 private
590 # Find project of id params[:id]
585 # Find project of id params[:id]
@@ -76,18 +76,8
76 <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> |
76 <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> |
77 <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
77 <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
78 <% end %>
78 <% end %>
79
80 <hr />
81 <p><%= link_to l(:label_feed_plural), {:action => 'feeds', :id => @project}, :class => 'icon icon-feed' %></p>
82 <% end %>
79 <% end %>
83
80
84 <% content_for :header_tags do %>
81 <% content_for :header_tags do %>
85 <%= auto_discovery_link_tag(:rss, {:controller => 'feeds', :action => 'issues', :project_id => @project, :key => @key}, {:title => l(:label_reported_issues)}) %>
82 <%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
86 <%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'issues', :project_id => @project, :key => @key, :format => 'atom'}, {:title => l(:label_reported_issues)}) %>
87
88 <%= auto_discovery_link_tag(:rss, {:controller => 'feeds', :action => 'history', :project_id => @project, :key => @key }, {:title => l(:label_changes_details)}) %>
89 <%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'history', :project_id => @project, :key => @key, :format => 'atom'}, {:title => l(:label_changes_details)}) %>
90
91 <%= auto_discovery_link_tag(:rss, {:controller => 'feeds', :action => 'news', :project_id => @project, :key => @key}, {:title => l(:label_news_latest)}) %>
92 <%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'news', :project_id => @project, :key => @key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
93 <% end %>
83 <% end %>
@@ -13,7 +13,7 REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs )
13
13
14 # Permissions
14 # Permissions
15 Redmine::AccessControl.map do |map|
15 Redmine::AccessControl.map do |map|
16 map.permission :view_project, {:projects => [:show, :activity, :feeds]}, :public => true
16 map.permission :view_project, {:projects => [:show, :activity]}, :public => true
17 map.permission :search_project, {:search => :index}, :public => true
17 map.permission :search_project, {:search => :index}, :public => true
18 map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
18 map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
19 map.permission :select_project_modules, {:projects => :modules}, :require => :member
19 map.permission :select_project_modules, {:projects => :modules}, :require => :member
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now