Added preview for issue notes.

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

Added preview for issue notes.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1096 e93f8b46-1217-0410-a6f0-8f06a7374b81
2d9e669e · Jean-Philippe Lang · d54ba39e · 2d9e669e · 2d9e669e · 2d9e669e
Commit 2d9e669e authored Jan 23, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 3 deletions

issues_controller.rb app/controllers/issues_controller.rb +1 -1

_update.rhtml app/views/issues/_update.rhtml +13 -1

show.rhtml app/views/issues/show.rhtml +0 -1

No files found.
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -242,7 +242,7 @@ class IssuesController < ApplicationController
  def preview
    issue = Issue.find_by_id(params[:id])
    @attachements = issue.attachments if issue
-    @text = params[:issue][:description]
+    @text = (params[:issue] ? params[:issue][:description] : nil) || params[:notes]
    render :partial => 'common/preview'
  end
  

--- a/app/views/issues/_update.rhtml
+++ b/app/views/issues/_update.rhtml
-<% labelled_tabular_form_for(:issue, @issue, :url => {:action => 'update', :id => @issue}, :html => {:multipart => true}) do |f| %>
+<% labelled_tabular_form_for(:issue, @issue, :url => {:action => 'update', :id => @issue},
+                                             :html => {:multipart => true,
+                                                       :id => 'issue-form'}) do |f| %>

 <div class="box">
 <% unless @status_options.empty? %>
@@ -39,4 +41,14 @@
 </div>

 <%= submit_tag l(:button_submit) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
+                     :method => 'post',
+                     :update => 'preview',
+                     :with => "Form.serialize('issue-form')",
+                     :complete => "window.location.hash='preview'"
+                   }, :accesskey => accesskey(:preview) %> |
+<%= toggle_link l(:button_cancel), 'update' %>
 <% end %>
+
+<div id="preview" class="wiki"></div>
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -94,7 +94,6 @@ end %>
  <div id="update" style="display:none;">
  <h3><%= l(:button_update) %></h3>
  <%= render :partial => 'update' %>
-  <%= toggle_link l(:button_cancel), 'update' %>
  </div>
 <% end %>