GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 47fa9ee3 authored by jplang's avatar jplang

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

git-svn-id: https://svn.redmine.org/redmine/trunk@10400 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 56a391ab
......@@ -34,6 +34,10 @@ class PreviewsController < ApplicationController
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
......
......@@ -3,7 +3,7 @@
<%= 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>
......
......@@ -16,7 +16,7 @@
: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>
......
......@@ -26,7 +26,8 @@ class PreviewsControllerTest < ActionController::TestCase
:members,
:enabled_modules,
:workflows,
:journals, :journal_details
:journals, :journal_details,
:news
def test_preview_new_issue
@request.session[:user_id] = 2
......@@ -55,7 +56,7 @@ class PreviewsControllerTest < ActionController::TestCase
assert_tag :p, :content => 'Foo'
end
def test_news
def test_preview_new_news
get :news, :project_id => 1,
:news => {:title => '',
:description => 'News description',
......@@ -65,4 +66,18 @@ class PreviewsControllerTest < ActionController::TestCase
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment