From 0144ff8fca674c90f091415ee4a44b1df98d8d00 Mon Sep 17 00:00:00 2001
From: Hagen Schink <h.schink@finn.de>
Date: Tue, 1 Apr 2014 11:29:45 +0200
Subject: [PATCH] Fix meeting preview

---
 app/controllers/meeting_contents_controller.rb | 17 +++++++++++------
 app/controllers/meeting_minutes_controller.rb  |  2 +-
 app/views/meeting_contents/_form.html.erb      | 11 +++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/controllers/meeting_contents_controller.rb b/app/controllers/meeting_contents_controller.rb
index 4077ee1d13..65c805a517 100644
--- a/app/controllers/meeting_contents_controller.rb
+++ b/app/controllers/meeting_contents_controller.rb
@@ -21,6 +21,7 @@
 class MeetingContentsController < ApplicationController
 
   include PaginationHelper
+  include OpenProject::Concerns::Preview
 
   menu_item :meetings
 
@@ -93,15 +94,10 @@ class MeetingContentsController < ApplicationController
     redirect_back_or_default :controller => '/meetings', :action => 'show', :id => @meeting
   end
 
-  def preview
-    (render_403; return) unless @content.editable?
-    @text = params[:text]
-    render :partial => 'common/preview'
-  end
-
   def default_breadcrumb
     MeetingsController.new.send(:default_breadcrumb)
   end
+
   private
 
   def find_meeting
@@ -111,4 +107,13 @@ class MeetingContentsController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render_404
   end
+
+  def parse_preview_data
+    text = { }
+
+    text = { WikiContent.human_attribute_name(:content) => params[@content_type][:text] } if @content.editable?
+
+    return text, [], @content
+  end
+
 end
diff --git a/app/controllers/meeting_minutes_controller.rb b/app/controllers/meeting_minutes_controller.rb
index 5897b3a724..e5f8a682b2 100644
--- a/app/controllers/meeting_minutes_controller.rb
+++ b/app/controllers/meeting_minutes_controller.rb
@@ -28,4 +28,4 @@ class MeetingMinutesController < MeetingContentsController
     @content = @meeting.minutes || @meeting.build_minutes
     @content_type = "meeting_minutes"
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/meeting_contents/_form.html.erb b/app/views/meeting_contents/_form.html.erb
index 2ead6b20f9..17a64437ff 100644
--- a/app/views/meeting_contents/_form.html.erb
+++ b/app/views/meeting_contents/_form.html.erb
@@ -27,17 +27,12 @@ See doc/COPYRIGHT.md for more details.
 <%= f.hidden_field :lock_version %>
 <p><label for="<%= content_type %>_comment"><%= Meeting.human_attribute_name(:comments) %></label><br /><%= f.text_field :comment, :size => 120 %></p>
 <p><%= submit_tag l(:button_save) %>
-<%= link_to_remote l(:label_preview),
-                    {:url => {:controller => '/' + content_type.pluralize, :action => 'preview', :meeting_id => content.meeting},
-                     :method => :post,
-                     :update => "#{content_type}_preview",
-                     :with => "'text=' + encodeURIComponent($('#{content_type}_text').value)",
-                     :complete => "Element.scrollTo('#{content_type}_preview')"
-                    }, :accesskey => accesskey(:preview) %> |
+<% path = send("preview_#{content_type}_path", content.meeting) %>
+<%= preview_link path, "#{content_type}_form", { class: 'preview' } %>
 <%= link_to l(:button_cancel), "#", :onclick => "$$('.show-#{content_type}').invoke('show'); $$('.edit-#{content_type}').invoke('hide'); return false;" %></p>
 <%= wikitoolbar_for "#{content_type}_text" %>
 <% end %>
 
-<div id="<%= content_type %>_preview" class="wiki"></div>
+<div id="preview" class="wiki"></div>
 
 <%= render :partial => 'shared/meeting_header' %>