jro_apps/redmine Commit - r10217:ca4f2c59b647

Attachments should be available to the text formatter when previewing an existing news....

Jean-Philippe Lang -

r10217:ca4f2c59b647

parent child

Context file:

r10217:ca4f2c59b647

Collapse all files

app/controllers/previews_controller.rb +4 0

               end
               def news
+                if params[:id].present? && news = News.visible.find_by_id(params[:id])
+                  @previewed = news
+                  @attachments = news.attachments
+                end
                 @text = (params[:news] ? params[:news][:description] : nil)
                 render :partial => 'common/preview'
               end

app/views/news/edit.html.erb +1 -1

             <%= labelled_form_for @news, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
-            <%= preview_link preview_news_path(:project_id => @project), 'news-form' %>
+            <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %>
             <% end %>
             <div id="preview" class="wiki"></div>

app/views/news/show.html.erb +1 -1

                                                        :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
-            <%= preview_link preview_news_path(:project_id => @project), 'news-form' %> |
+            <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %> |
             <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
             <% end %>
             <div id="preview" class="wiki"></div>

test/functional/previews_controller_test.rb +17 -2

                        :members,
                        :enabled_modules,
                        :workflows,
-                       :journals, :journal_details
+                       :journals, :journal_details,
+                       :news
               def test_preview_new_issue
                 @request.session[:user_id] = 2
                 assert_tag :p, :content => 'Foo'
               end
-              def test_news
+              def test_preview_new_news
                 get :news, :project_id => 1,
                               :news => {:title => '',
                                         :description => 'News description',
                 assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
                                                :content => /News description/
               end
+              def test_existing_new_news
+                get :news, :project_id => 1, :id => 2,
+                              :news => {:title => '',
+                                        :description => 'News description',
+                                        :summary => ''}
+                assert_response :success
+                assert_template 'common/_preview'
+                assert_equal News.find(2), assigns(:previewed)
+                assert_not_nil assigns(:attachments)
+                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