jro_apps/redmine Commit - r3994:d090e539f6a4

Merged r4034 form trunk....

Eric Davis -

r3994:d090e539f6a4

parent child

Context file:

r3994:d090e539f6a4

Collapse all files

app/controllers/issues_controller.rb +4 -19

               before_filter :find_issue, :only => [:show, :edit, :update]
               before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy]
               before_filter :find_project, :only => [:new, :create]
-              before_filter :authorize, :except => [:index, :changes]
+              before_filter :authorize, :except => [:index]
-              before_filter :find_optional_project, :only => [:index, :changes]
+              before_filter :find_optional_project, :only => [:index]
               before_filter :check_for_default_issue_status, :only => [:new, :create]
               before_filter :build_new_issue_from_params, :only => [:new, :create]
-              accept_key_auth :index, :show, :changes
+              accept_key_auth :index, :show
               rescue_from Query::StatementInvalid, :with => :query_statement_invalid
                 render_404
               end
-              def changes
-                retrieve_query
-                sort_init 'id', 'desc'
-                sort_update(@query.sortable_columns)
-                if @query.valid?
-                  @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
-                                              :limit => 25)
-                end
-                @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
-                render :layout => false, :content_type => 'application/atom+xml'
-              rescue ActiveRecord::RecordNotFound
-                render_404
-              end
               def show
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                 @journals.each_with_index {|j,i| j.indice = i+1}
                   format.html { render :template => 'issues/show.rhtml' }
                   format.xml  { render :layout => false }
                   format.json { render :text => @issue.to_json, :layout => false }
-                  format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
+                  format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
                   format.pdf  { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
                 end
               end

app/controllers/journals_controller.rb +23 0

@@ -18,6 +18,29
18	class JournalsController < ApplicationController	18	class JournalsController < ApplicationController
19	before_filter :find_journal, :only => [:edit]	19	before_filter :find_journal, :only => [:edit]
20	before_filter :find_issue, :only => [:new]	20	before_filter :find_issue, :only => [:new]
		21	before_filter :find_optional_project, :only => [:index]
		22	accept_key_auth :index
		23
		24	helper :issues
		25	helper :queries
		26	include QueriesHelper
		27	helper :sort
		28	include SortHelper
		29
		30	def index
		31	retrieve_query
		32	sort_init 'id', 'desc'
		33	sort_update(@query.sortable_columns)
		34
		35	if @query.valid?
		36	@journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
		37	:limit => 25)
		38	end
		39	@title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
		40	render :layout => false, :content_type => 'application/atom+xml'
		41	rescue ActiveRecord::RecordNotFound
		42	render_404
		43	end
21		44
22	def new	45	def new
23	journal = Journal.find(params[:journal_id]) if params[:journal_id]	46	journal = Journal.find(params[:journal_id]) if params[:journal_id]

app/views/issues/index.rhtml +1 -1

             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
-                <%= auto_discovery_link_tag(:atom, {:action => 'changes', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
+                <%= auto_discovery_link_tag(:atom, {:controller => 'journals', :action => 'index', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
             <% end %>
             <%= context_menu issues_context_menu_path %>

app/views/journals/index.rxml ~~app/views/issues/changes.rxml~~ renamed 0 0

NO CONTENT: file renamed from app/views/issues/changes.rxml to app/views/journals/index.rxml

config/routes.rb +1 0

               # TODO: would look nicer as /issues/:id/preview
               map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue'
               map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues'
+              map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'
               map.with_options :controller => 'issues' do |issues_routes|
                 issues_routes.with_options :conditions => {:method => :get} do |issues_views|

test/functional/issues_controller_test.rb +1 -8

                 assert_equal columns, session[:query][:column_names].map(&:to_s)
               end
-              def test_changes
-                get :changes, :project_id => 1
-                assert_response :success
-                assert_not_nil assigns(:journals)
-                assert_equal 'application/atom+xml', @response.content_type
-              end
               def test_show_by_anonymous
                 get :show, :id => 1
                 assert_response :success
               def test_show_atom
                 get :show, :id => 2, :format => 'atom'
                 assert_response :success
-                assert_template 'changes.rxml'
+                assert_template 'journals/index.rxml'
                 # Inline image
                 assert_select 'content', :text => Regexp.new(Regexp.quote('http://test.host/attachments/download/10'))
               end

test/functional/journals_controller_test.rb +7 0

                 User.current = nil
               end
+              def test_index
+                get :index, :project_id => 1
+                assert_response :success
+                assert_not_nil assigns(:journals)
+                assert_equal 'application/atom+xml', @response.content_type
+              end
               def test_reply_to_issue
                 @request.session[:user_id] = 2
                 get :new, :id => 1

test/integration/routing_test.rb +2 0

                 should_route :post, "/issues/preview/123", :controller => 'previews', :action => 'issue', :id => '123'
                 should_route :get, "/issues/context_menu", :controller => 'context_menus', :action => 'issues'
                 should_route :post, "/issues/context_menu", :controller => 'context_menus', :action => 'issues'
+                should_route :get, "/issues/changes", :controller => 'journals', :action => 'index'
               end
               context "issue categories" do

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages