jro_apps/redmine Commit - r14963:b56f77322ac2

Adds a "New issue" link on the global issue list (#6204)....

Jean-Philippe Lang -

r14963:b56f77322ac2

parent child

Context file:

r14963:b56f77322ac2

Collapse all files

The requested changes are too big and content was truncated. Show full diff

app/helpers/routes_helper.rb +8 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             module RoutesHelper
               # Returns the path to project issues or to the cross-project
               # issue list if project is nil
               def _project_issues_path(project, *args)
                 if project
                   project_issues_path(project, *args)
                 else
                   issues_path(*args)
                 end
               end
+              def _new_project_issue_path(project, *args)
+                if project
+                  new_project_issue_path(project, *args)
+                else
+                  new_issue_path(*args)
+                end
+              end
               def _project_calendar_path(project, *args)
                 project ? project_calendar_path(project, *args) : issues_calendar_path(*args)
               end
               def _project_gantt_path(project, *args)
                 project ? project_gantt_path(project, *args) : issues_gantt_path(*args)
               end
               def _time_entries_path(project, issue, *args)
                 if issue
                   issue_time_entries_path(issue, *args)
                 elsif project
                   project_time_entries_path(project, *args)
                 else
                   time_entries_path(*args)
                 end
               end
               def _report_time_entries_path(project, issue, *args)
                 if issue
                   report_issue_time_entries_path(issue, *args)
                 elsif project
                   report_project_time_entries_path(project, *args)
                 else
                   report_time_entries_path(*args)
                 end
               end
               def _new_time_entry_path(project, issue, *args)
                 if issue
                   new_issue_time_entry_path(issue, *args)
                 elsif project
                   new_project_time_entry_path(project, *args)
                 else
                   new_time_entry_path(*args)
                 end
               end
               def board_path(board, *args)
                 project_board_path(board.project, board, *args)
               end
             end

app/views/issues/index.html.erb +2 -2

             <div class="contextual">
-              <% if @project && User.current.allowed_to?(:add_issues, @project) && @project.trackers.any? %>
+              <% if User.current.allowed_to?(:add_issues, @project, :global => true) && (@project.nil? || @project.trackers.any?) %>
-                <%= link_to l(:label_issue_new), new_project_issue_path(@project), :class => 'icon icon-add new-issue' %>
+                <%= link_to l(:label_issue_new), _new_project_issue_path(@project), :class => 'icon icon-add new-issue' %>
               <% end %>
             </div>
             <h2><%= @query.new_record? ? l(:label_issue_plural) : @query.name %></h2>
             <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
             <%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
                         :method => :get, :id => 'query_form') do %>
               <div id="query_form_with_buttons" class="hide-when-print">
                 <%= hidden_field_tag 'set_filter', '1' %>
                 <div id="query_form_content">
                 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
                   <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
                   <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                   </div>
                 </fieldset>
                 <fieldset id="options" class="collapsible collapsed">
                   <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
                   <div style="display: none;">
                     <table>
                       <tr>
                         <td class="field"><%= l(:field_column_names) %></td>
                         <td><%= render_query_columns_selection(@query) %></td>
                       </tr>
                       <tr>
                         <td class="field"><label for='group_by'><%= l(:field_group_by) %></label></td>
                         <td><%= select_tag('group_by',
                                            options_for_select(
                                              [[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]},
                                              @query.group_by)
                                    ) %></td>
                       </tr>
                       <tr>
                         <td class="field"><%= l(:button_show) %></td>
                         <td><%= available_block_columns_tags(@query) %></td>
                       </tr>
                       <tr>
                         <td><%= l(:label_total_plural) %></td>
                         <td><%= available_totalable_columns_tags(@query) %></td>
                       </tr>
                     </table>
                   </div>
                 </fieldset>
                 </div>
                 <p class="buttons">
                 <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
                 <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
                 <% if @query.new_record? %>
                   <% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
                     <%= link_to_function l(:button_save),
                                          "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
                                          :class => 'icon icon-save' %>
                   <% end %>
                 <% else %>
                   <% if @query.editable_by?(User.current) %>
                     <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
                     <%= delete_link query_path(@query) %>
                   <% end %>
                 <% end %>
                 </p>
               </div>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <%= render_query_totals(@query) %>
             <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
             <span class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></span>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
               <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
               <%= f.link_to 'PDF', :url => params %>
             <% end %>
             <div id="csv-export-options" style="display:none;">
               <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
               <%= form_tag(_project_issues_path(@project, :format => 'csv'), :method => :get, :id => 'csv-export-form') do %>
               <%= query_as_hidden_field_tags(@query) %>
               <%= hidden_field_tag 'sort', @sort_criteria.to_param, :id => nil %>
               <p>
                 <label><%= radio_button_tag 'csv[columns]', '', true %> <%= l(:description_selected_columns) %></label><br />
                 <label><%= radio_button_tag 'csv[columns]', 'all' %> <%= l(:description_all_columns) %></label>
               </p>
               <p>
                 <label><%= check_box_tag 'csv[description]', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
               </p>
               <% if @issue_count > Setting.issues_export_limit.to_i %>
               <p class="icon icon-warning">
                 <%= l(:setting_issues_export_limit) %>: <%= Setting.issues_export_limit.to_i %>
               </p>
               <% end %>
               <p class="buttons">
                 <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
                 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
               </p>
               <% end %>
             </div>
             <% end %>
             <%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom,
                                             {:query_id => @query, :format => 'atom',
                                              :page => nil, :key => User.current.rss_key},
                                             :title => l(:label_issue_plural)) %>
                 <%= auto_discovery_link_tag(:atom,
                                             {:controller => 'journals', :action => 'index',
                                              :query_id => @query, :format => 'atom',
                                              :page => nil, :key => User.current.rss_key},
                                             :title => l(:label_changes_details)) %>
             <% end %>
             <%= context_menu issues_context_menu_path %>

test/functional/issues_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

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