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

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1138 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 85151e9055499caf29a53268b9f0a69f9d2faff5..b0e82d365da04b08dc6142eeaf343199d32fb4a1 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -21,7 +21,7 @@ class IssuesController < ApplicationController
   
   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
@@ -311,7 +311,7 @@ class IssuesController < ApplicationController
   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'

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index b867b4ae65a1cd6b48463865c9b229e4aaaae912..05d41fa30d483556228aa853778fbde0fcb91af4 100644 (file)
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -34,6 +34,7 @@ private
   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

diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index 5bd685e47bb94e2b60665883cd5ed5dda79b042a..7c4cf501ca83ebb305e71723a8a5872014848a75 100644 (file)
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -28,7 +28,7 @@
     <%= 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")',

diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml
index 52c32dbbdbca31ed5a966de2099328894c007caf..7b9dde899f5a655dba524131167e442174a4698d 100644 (file)
--- a/app/views/issues/new.rhtml
+++ b/app/views/issues/new.rhtml
@@ -8,7 +8,7 @@
     </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')",