jro_apps/redmine Commit - r1660:93201e7386eb

Fixed: Wiki Linking Fails on News Item Preview (#1661)....

Jean-Philippe Lang -

r1660:93201e7386eb

parent child

Context file:

r1660:93201e7386eb

Collapse all files

app/controllers/news_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 NewsController < ApplicationController
               layout 'base'
               before_filter :find_news, :except => [:new, :index, :preview]
-              before_filter :find_project, :only => :new
+              before_filter :find_project, :only => [:new, :preview]
               before_filter :authorize, :except => [:index, :preview]
               before_filter :find_optional_project, :only => :index
               accept_key_auth :index
               def index
                 @news_pages, @newss = paginate :news,
                                                :per_page => 10,
                                                :conditions => (@project ? {:project_id => @project.id} : Project.visible_by(User.current)),
                                                :include => [:author, :project],
                                                :order => "#{News.table_name}.created_on DESC"
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
                 end
               end
               def show
                 @comments = @news.comments
                 @comments.reverse! if User.current.wants_comments_in_reverse_order?
               end
               def new
                 @news = News.new(:project => @project, :author => User.current)
                 if request.post?
                   @news.attributes = params[:news]
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
                     redirect_to :controller => 'news', :action => 'index', :project_id => @project
                   end
                 end
               end
               def edit
                 if request.post? and @news.update_attributes(params[:news])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @news
                 end
               end
               def add_comment
                 @comment = Comment.new(params[:comment])
                 @comment.author = User.current
                 if @news.comments << @comment
                   flash[:notice] = l(:label_comment_added)
                   redirect_to :action => 'show', :id => @news
                 else
                   render :action => 'show'
                 end
               end
               def destroy_comment
                 @news.comments.find(params[:comment_id]).destroy
                 redirect_to :action => 'show', :id => @news
               end
               def destroy
                 @news.destroy
                 redirect_to :action => 'index', :project_id => @project
               end
               def preview
                 @text = (params[:news] ? params[:news][:description] : nil)
                 render :partial => 'common/preview'
               end
             private
               def find_news
                 @news = News.find(params[:id])
                 @project = @news.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:project_id]
                 @project = Project.find(params[:project_id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/news/edit.rhtml +1 -1

             <h2><%=l(:label_news)%></h2>
             <% labelled_tabular_form_for :news, @news, :url => { :action => "edit" },
                                                        :html => { :id => 'news-form' } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <%= link_to_remote l(:label_preview),
-                               { :url => { :controller => 'news', :action => 'preview' },
+                               { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                                  :method => 'post',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
                                }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>

app/views/news/index.rhtml +1 -1

             <div class="contextual">
             <%= link_to_if_authorized(l(:label_news_new),
                                       {:controller => 'news', :action => 'new', :project_id => @project},
                                       :class => 'icon icon-add',
                                       :onclick => 'Element.show("add-news"); return false;') if @project %>
             </div>
             <div id="add-news" style="display:none;">
             <h2><%=l(:label_news_new)%></h2>
             <% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
                                                        :html => { :id => 'news-form' } do |f| %>
             <%= render :partial => 'news/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <%= link_to_remote l(:label_preview),
-                               { :url => { :controller => 'news', :action => 'preview' },
+                               { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                                  :method => 'post',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
                                }, :accesskey => accesskey(:preview) %> |
             <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
             <% end if @project %>
             <div id="preview" class="wiki"></div>
             </div>
             <h2><%=l(:label_news_plural)%></h2>
             <% if @newss.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <% @newss.each do |news| %>
                 <h3><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless news.project == @project %>
                 <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
                 <%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %></h3>
                 <p class="author"><%= authoring news.created_on, news.author %></p>
                 <div class="wiki">
                 <%= textilizable(news.description) %>
                 </div>
             <% end %>
             <% end %>
             <p class="pagination"><%= pagination_links_full @news_pages %></p>
             <p class="other-formats">
             <%= l(:label_export_to) %>
             <span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
             </p>
             <% content_for :header_tags do %>
               <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
             <% end %>
             <% html_title(l(:label_news_plural)) -%>

app/views/news/new.rhtml +1 -1

             <h2><%=l(:label_news_new)%></h2>
             <% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
                                                        :html => { :id => 'news-form' } do |f| %>
             <%= render :partial => 'news/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <%= link_to_remote l(:label_preview),
-                               { :url => { :controller => 'news', :action => 'preview' },
+                               { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                                  :method => 'post',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
                                }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>

app/views/news/show.rhtml +1 -1

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit),
                                       {:controller => 'news', :action => 'edit', :id => @news},
                                       :class => 'icon icon-edit',
                                       :accesskey => accesskey(:edit),
                                       :onclick => 'Element.show("edit-news"); return false;' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </div>
             <h2><%=h @news.title %></h2>
             <div id="edit-news" style="display:none;">
             <% labelled_tabular_form_for :news, @news, :url => { :action => "edit", :id => @news },
                                                        :html => { :id => 'news-form' } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <%= link_to_remote l(:label_preview),
-                               { :url => { :controller => 'news', :action => 'preview' },
+                               { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                                  :method => 'post',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
                                }, :accesskey => accesskey(:preview) %> |
             <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news")' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <p><em><% unless @news.summary.blank? %><%=h @news.summary %><br /><% end %>
             <span class="author"><%= authoring @news.created_on, @news.author %></span></em></p>
             <div class="wiki">
             <%= textilizable(@news.description) %>
             </div>
             <br />
             <div id="comments" style="margin-bottom:16px;">
             <h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3>
             <% @comments.each do |comment| %>
                 <% next if comment.new_record? %>
                 <div class="contextual">
                 <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment},
                                                                    :confirm => l(:text_are_you_sure), :method => :post, :title => l(:button_delete) %>
                 </div>
                 <h4><%= authoring comment.created_on, comment.author %></h4>
                 <%= textilizable(comment.comments) %>
             <% end if @comments.any? %>
             </div>
             <% if authorize_for 'news', 'add_comment' %>
             <p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>
             <% form_tag({:action => 'add_comment', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
             <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
             <%= wikitoolbar_for 'comment_comments' %>
             <p><%= submit_tag l(:button_add) %></p>
             <% end %>
             <% end %>
             <% html_title @news.title -%>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% 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