jro_apps/redmine Commit - r5126:13d6b3129b94

Adds support for preview when editing an issue note (#5520)....

Jean-Philippe Lang -

r5126:13d6b3129b94

parent child

Context file:

r5126:13d6b3129b94

Collapse all files

app/controllers/previews_controller.rb +17 0

+            # Redmine - project management software
+            # Copyright (C) 2006-2011  Jean-Philippe Lang
+            #
+            # This program is free software; you can redistribute it and/or
+            # modify it under the terms of the GNU General Public License
+            # as published by the Free Software Foundation; either version 2
+            # of the License, or (at your option) any later version.
+            #
+            # This program is distributed in the hope that it will be useful,
+            # but WITHOUT ANY WARRANTY; without even the implied warranty of
+            # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+            # GNU General Public License for more details.
+            #
+            # You should have received a copy of the GNU General Public License
+            # along with this program; if not, write to the Free Software
+            # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class PreviewsController < ApplicationController
               before_filter :find_project
               def issue
                 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
                 if @issue
                   @attachements = @issue.attachments
                   @description = params[:issue] && params[:issue][:description]
                   if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
                     @description = nil
                   end
                   @notes = params[:notes]
                 else
                   @description = (params[:issue] ? params[:issue][:description] : nil)
                 end
                 render :layout => false
               end
               def news
                 @text = (params[:news] ? params[:news][:description] : nil)
                 render :partial => 'common/preview'
               end
               private
               def find_project
                 project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
                 @project = Project.find(project_id)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/journals/_notes_form.rhtml +10 0

             <% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
                 <%= text_area_tag :notes, @journal.notes,
                       :id => "journal_#{@journal.id}_notes",
                       :class => 'wiki-edit',
                       :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
                 <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
                 <p><%= submit_tag l(:button_save) %>
+                <%= link_to_remote l(:label_preview),
+                                   { :url => preview_issue_path(:project_id => @project, :id => @journal.issue),
+                                     :method => 'post',
+                                     :update => "journal_#{@journal.id}_preview",
+                                     :with => "Form.serialize('journal-#{@journal.id}-form')",
+                                     :complete => "Element.scrollTo('journal_#{@journal.id}_preview')"
+                                   }, :accesskey => accesskey(:preview) %>
+                |
                 <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
                                                                 "Element.show('journal-#{@journal.id}-notes'); return false;" %></p>
+                <div id="journal_<%= @journal.id %>_preview" class="wiki"></div>
             <% end %>
             <%= wikitoolbar_for "journal_#{@journal.id}_notes" %>

test/functional/previews_controller_test.rb +26 0

+            # Redmine - project management software
+            # Copyright (C) 2006-2011  Jean-Philippe Lang
+            #
+            # This program is free software; you can redistribute it and/or
+            # modify it under the terms of the GNU General Public License
+            # as published by the Free Software Foundation; either version 2
+            # of the License, or (at your option) any later version.
+            #
+            # This program is distributed in the hope that it will be useful,
+            # but WITHOUT ANY WARRANTY; without even the implied warranty of
+            # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+            # GNU General Public License for more details.
+            #
+            # You should have received a copy of the GNU General Public License
+            # along with this program; if not, write to the Free Software
+            # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class PreviewsControllerTest < ActionController::TestCase
               fixtures :all
               def test_preview_new_issue
                 @request.session[:user_id] = 2
                 post :issue, :project_id => '1', :issue => {:description => 'Foo'}
                 assert_response :success
                 assert_template 'preview'
                 assert_not_nil assigns(:description)
               end
               def test_preview_issue_notes
                 @request.session[:user_id] = 2
                 post :issue, :project_id => '1', :id => 1, :issue => {:description => Issue.find(1).description}, :notes => 'Foo'
                 assert_response :success
                 assert_template 'preview'
                 assert_not_nil assigns(:notes)
               end
+              def test_preview_journal_notes_for_update
+                @request.session[:user_id] = 2
+                post :issue, :project_id => '1', :id => 1, :notes => 'Foo'
+                assert_response :success
+                assert_template 'preview'
+                assert_not_nil assigns(:notes)
+                assert_tag :p, :content => 'Foo'
+              end
               def test_news
                 get :news, :project_id => 1,
                               :news => {:title => '',
                                         :description => 'News description',
                                         :summary => ''}
                 assert_response :success
                 assert_template 'common/_preview'
                 assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
                                                :content => /News description/
               end
             end

General Comments 0

Write
Preview

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

No TODOs yet

	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