jro_apps/redmine Commit - r4352:224921460a0a

app/controllers/application_controller.rb +21 -1

@@ -22,7 +22,7 class ApplicationController < ActionController::Base
22	include Redmine::I18n	22	include Redmine::I18n
23		23
24	layout 'base'	24	layout 'base'
25	exempt_from_layout 'builder', '~~apit~~'	25	exempt_from_layout 'builder', 'rsb'
26		26
27	# Remove broken cookie after upgrade from 0.8.x (#4292)	27	# Remove broken cookie after upgrade from 0.8.x (#4292)
28	# See https://rails.lighthouseapp.com/projects/8994/tickets/3360	28	# See https://rails.lighthouseapp.com/projects/8994/tickets/3360
@@ -426,4 +426,24 class ApplicationController < ActionController::Base
426	)	426	)
427	render options	427	render options
428	end	428	end
		429
		430	# Overrides #default_template so that the api template
		431	# is used automatically if it exists
		432	def default_template(action_name = self.action_name)
		433	if api_request?
		434	begin
		435	return self.view_paths.find_template(default_template_name(action_name), 'api')
		436	rescue ::ActionView::MissingTemplate
		437	# the api template was not found
		438	# fallback to the default behaviour
		439	end
		440	end
		441	super
		442	end
		443
		444	# Overrides #pick_layout so that #render with no arguments
		445	# doesn't use the layout for api requests
		446	def pick_layout(*args)
		447	api_request? ? nil : super
		448	end
429	end	449	end

app/controllers/issues_controller.rb +3 -3

                   respond_to do |format|
                     format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
-                    format.api  { render :template => 'issues/index.apit' }
+                    format.api
                     format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
                     format.csv  { send_data(issues_to_csv(@issues, @project), :type => 'text/csv; header=present', :filename => 'export.csv') }
                     format.pdf  { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'export.pdf') }
                 @time_entry = TimeEntry.new
                 respond_to do |format|
                   format.html { render :template => 'issues/show.rhtml' }
-                  format.api  { render :template => 'issues/show.apit' }
+                  format.api
                   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
                       redirect_to(params[:continue] ?  { :action => 'new', :project_id => @project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
                                   { :action => 'show', :id => @issue })
                     }
-                    format.api  { render :template => 'issues/show.apit', :status => :created, :location => issue_url(@issue) }
+                    format.api  { render :action => 'show', :status => :created, :location => issue_url(@issue) }
                   end
                   return
                 else

app/controllers/projects_controller.rb +2 -3

                   }
                   format.api  {
                     @projects = Project.visible.find(:all, :order => 'lft')
-                    render :template => 'projects/index.apit'
                   }
                   format.atom {
                     projects = Project.visible.find(:all, :order => 'created_on DESC',
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :controller => 'projects', :action => 'settings', :id => @project
                     }
-                    format.api  { render :template => 'projects/show.apit', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
+                    format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
                   end
                 else
                   respond_to do |format|
                 respond_to do |format|
                   format.html
-                  format.api { render :template => 'projects/show.apit'}
+                  format.api
                 end
               end

app/controllers/timelog_controller.rb +2 -4

                                                 :order => sort_clause,
                                                 :limit  =>  @entry_pages.items_per_page,
                                                 :offset =>  @entry_pages.current.offset)
-                      render :template => 'timelog/index.apit'
                     }
                     format.atom {
                       entries = TimeEntry.find(:all,
                 respond_to do |format|
                   # TODO: Implement html response
                   format.html { render :nothing => true, :status => 406 }
-                  format.api  { render :template => 'timelog/show.apit' }
+                  format.api
                 end
               end
                       flash[:notice] = l(:notice_successful_update)
                       redirect_back_or_default :action => 'index', :project_id => @time_entry.project
                     }
-                    format.api  { render :template => 'timelog/show.apit', :status => :created, :location => time_entry_url(@time_entry) }
+                    format.api  { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
                   end
                 else
                   respond_to do |format|

app/controllers/users_controller.rb +3 -3

             		respond_to do |format|
             		  format.html { render :layout => !request.xhr? }
-                  format.api  { render :template => 'users/index.apit' }
+                  format.api
             		end
               end
                 respond_to do |format|
                   format.html { render :layout => 'base' }
-                  format.api  { render :template => 'users/show.apit' }
+                  format.api
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
                         {:controller => 'users', :action => 'edit', :id => @user}
                       )
                     }
-                    format.api  { render :template => 'users/show.apit', :status => :created, :location => user_url(@user) }
+                    format.api  { render :action => 'show', :status => :created, :location => user_url(@user) }
                   end
                 else
                   @auth_sources = AuthSource.find(:all)

app/views/issues/index.api.rsb ~~app/views/issues/index.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/issues/index.apit to app/views/issues/index.api.rsb

app/views/issues/show.api.rsb ~~app/views/issues/show.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/issues/show.apit to app/views/issues/show.api.rsb

app/views/projects/index.api.rsb ~~app/views/projects/index.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/projects/index.apit to app/views/projects/index.api.rsb

app/views/projects/show.api.rsb ~~app/views/projects/show.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/projects/show.apit to app/views/projects/show.api.rsb

app/views/timelog/index.api.rsb ~~app/views/timelog/index.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/timelog/index.apit to app/views/timelog/index.api.rsb

app/views/timelog/show.api.rsb ~~app/views/timelog/show.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/timelog/show.apit to app/views/timelog/show.api.rsb

app/views/users/index.api.rsb ~~app/views/users/index.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/users/index.apit to app/views/users/index.api.rsb

app/views/users/show.api.rsb ~~app/views/users/show.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/users/show.apit to app/views/users/show.api.rsb

lib/redmine.rb +1 -1

               format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
             end
-            ActionView::Template.register_template_handler :apit, Redmine::Views::ApiTemplateHandler
+            ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler

	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