jro_apps/redmine Commit - r7784:3e0936606ec9

Removed object name from form_for arguments....

Jean-Philippe Lang -

r7784:3e0936606ec9

parent child

Context file:

r7784:3e0936606ec9

Collapse all files

app/controllers/news_controller.rb +4 -1

             # 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 NewsController < ApplicationController
               default_search_scope :news
               model_object News
               before_filter :find_model_object, :except => [:new, :create, :index]
               before_filter :find_project_from_association, :except => [:new, :create, :index]
               before_filter :find_project, :only => [:new, :create]
               before_filter :authorize, :except => [:index]
               before_filter :find_optional_project, :only => :index
               accept_rss_auth :index
               accept_api_auth :index
               helper :watchers
               def index
                 case params[:format]
                 when 'xml', 'json'
                   @offset, @limit = api_offset_and_limit
                 else
                   @limit =  10
                 end
                 scope = @project ? @project.news.visible : News.visible
                 @news_count = scope.count
                 @news_pages = Paginator.new self, @news_count, @limit, params['page']
                 @offset ||= @news_pages.current.offset
                 @newss = scope.all(:include => [:author, :project],
                                                    :order => "#{News.table_name}.created_on DESC",
                                                    :offset => @offset,
                                                    :limit => @limit)
                 respond_to do |format|
-                  format.html { render :layout => false if request.xhr? }
+                  format.html {
+                    @news = News.new # for adding news inline
+                    render :layout => false if request.xhr?
+                  }
                   format.api
                   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)
               end
               def create
                 @news = News.new(:project => @project, :author => User.current)
                 if request.post?
                   @news.attributes = params[:news]
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'news', :action => 'index', :project_id => @project
                   else
                     render :action => 'new'
                   end
                 end
               end
               def edit
               end
               def update
                 if request.put? and @news.update_attributes(params[:news])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @news
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 @news.destroy
                 redirect_to :action => 'index', :project_id => @project
               end
             private
               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.html.erb +1 -2

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

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

             <div class="contextual">
             <%= link_to(l(:label_news_new),
                         new_project_news_path(@project),
                         :class => 'icon icon-add',
                         :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
             </div>
             <div id="add-news" style="display:none;">
             <h2><%=l(:label_news_new)%></h2>
-            <% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
+            <% labelled_tabular_form_for @news, :url => project_news_index_path(@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 => preview_news_path(:project_id => @project),
                                  :method => 'get',
                                  :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><%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %>
                 <%= link_to h(news.title), news_path(news) %>
                 <%= "(#{l(:label_x_comments, :count => news.comments_count)})" 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>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
             <% end %>
             <% content_for :header_tags do %>
               <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% html_title(l(:label_news_plural)) -%>

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

             <h2><%=l(:label_news_new)%></h2>
-            <% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
+            <% labelled_tabular_form_for @news, :url => project_news_index_path(@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 => preview_news_path(:project_id => @project),
             	                     :method => 'get',
             	                     :update => 'preview',
             	                     :with => "Form.serialize('news-form')"
             	                   }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>

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