jro_apps/redmine Commit - r1124:30a7314b861f

Fixed: wiki and changeset links not displayed when previewing issue description or notes....

Jean-Philippe Lang -

r1124:30a7314b861f

parent child

Context file:

r1124:30a7314b861f

app/controllers/issues_controller.rb +2 -2

               before_filter :find_issue, :only => [:show, :edit, :destroy_attachment]
               before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
-              before_filter :find_project, :only => [:new, :update_form]
+              before_filter :find_project, :only => [:new, :update_form, :preview]
               before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
               before_filter :find_optional_project, :only => [:index, :changes]
               accept_key_auth :index, :changes
               end
               def preview
-                issue = Issue.find_by_id(params[:id])
+                issue = @project.issues.find_by_id(params[:id])
                 @attachements = issue.attachments if issue
                 @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
                 render :partial => 'common/preview'

app/controllers/journals_controller.rb +1 0

               def find_journal
                 @journal = Journal.find(params[:id])
                 render_403 and return false unless @journal.editable_by?(User.current)
+                @project = @journal.journalized.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end

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

                 <%= f.hidden_field :lock_version %>
                 <%= submit_tag l(:button_submit) %>
                 <%= link_to_remote l(:label_preview),
-                                   { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
+                                   { :url => { :controller => 'issues', :action => 'preview', :project_id => @project, :id => @issue },
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => 'Form.serialize("issue-form")',

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

                 </div>
                 <%= submit_tag l(:button_create) %>
                 <%= link_to_remote l(:label_preview),
-                                   { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
+                                   { :url => { :controller => 'issues', :action => 'preview', :project_id => @project, :id => @issue },
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => "Form.serialize('issue-form')",

General Comments 0

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

No TODOs yet

	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