jro_apps/redmine Commit - r670:088563db3e00

Fixed: "new issue" drop-down only visible by admin users....

Jean-Philippe Lang -

r670:088563db3e00

parent child

Context file:

r670:088563db3e00

Collapse all files

app/helpers/projects_helper.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.
             module ProjectsHelper
               def link_to_version(version, options = {})
                 return '' unless version && version.is_a?(Version)
                 link_to version.name, {:controller => 'projects',
                                        :action => 'roadmap',
                                        :id => version.project_id,
                                        :completed => (version.completed? ? 1 : nil),
                                        :anchor => version.name
                                       }, options
               end
               # Generates a gantt image
               # Only defined if RMagick is avalaible
               def gantt_image(events, date_from, months, zoom)
                 date_to = (date_from >> months)-1
                 show_weeks = zoom > 1
                 show_days = zoom > 2
                 subject_width = 320
                 header_heigth = 18
                 # width of one day in pixels
                 zoom = zoom*2
                 g_width = (date_to - date_from + 1)*zoom
                 g_height = 20 * events.length + 20
                 headers_heigth = (show_weeks ? 2*header_heigth : header_heigth)
                 height = g_height + headers_heigth
                 imgl = Magick::ImageList.new
                 imgl.new_image(subject_width+g_width+1, height)
                 gc = Magick::Draw.new
                 # Subjects
                 top = headers_heigth + 20
                 gc.fill('black')
                 gc.stroke('transparent')
                 gc.stroke_width(1)
                 events.each do |i|
                   gc.text(4, top + 2, (i.is_a?(Issue) ? i.subject : i.name))
                   top = top + 20
                 end
                 # Months headers
                 month_f = date_from
                 left = subject_width
                 months.times do
                   width = ((month_f >> 1) - month_f) * zoom
                   gc.fill('white')
                   gc.stroke('grey')
                   gc.stroke_width(1)
                   gc.rectangle(left, 0, left + width, height)
                   gc.fill('black')
                   gc.stroke('transparent')
                   gc.stroke_width(1)
                   gc.text(left.round + 8, 14, "#{month_f.year}-#{month_f.month}")
                   left = left + width
                   month_f = month_f >> 1
                 end
                 # Weeks headers
                 if show_weeks
                 	left = subject_width
                 	height = header_heigth
                 	if date_from.cwday == 1
                 	    # date_from is monday
                         week_f = date_from
                 	else
                 	    # find next monday after date_from
                 		week_f = date_from + (7 - date_from.cwday + 1)
                 		width = (7 - date_from.cwday + 1) * zoom
                         gc.fill('white')
                         gc.stroke('grey')
                         gc.stroke_width(1)
                         gc.rectangle(left, header_heigth, left + width, 2*header_heigth + g_height-1)
                 		left = left + width
                 	end
                 	while week_f <= date_to
                 		width = (week_f + 6 <= date_to) ? 7 * zoom : (date_to - week_f + 1) * zoom
                         gc.fill('white')
                         gc.stroke('grey')
                         gc.stroke_width(1)
                         gc.rectangle(left.round, header_heigth, left.round + width, 2*header_heigth + g_height-1)
                         gc.fill('black')
                         gc.stroke('transparent')
                         gc.stroke_width(1)
                         gc.text(left.round + 2, header_heigth + 14, week_f.cweek.to_s)
                 		left = left + width
                 		week_f = week_f+7
                 	end
                 end
                 # Days details (week-end in grey)
                 if show_days
                 	left = subject_width
                 	height = g_height + header_heigth - 1
                 	wday = date_from.cwday
                 	(date_to - date_from + 1).to_i.times do
                       width =  zoom
                       gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')
                       gc.stroke('grey')
                       gc.stroke_width(1)
                       gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)
                       left = left + width
                       wday = wday + 1
                       wday = 1 if wday > 7
                 	end
                 end
                 # border
                 gc.fill('transparent')
                 gc.stroke('grey')
                 gc.stroke_width(1)
                 gc.rectangle(0, 0, subject_width+g_width, headers_heigth)
                 gc.stroke('black')
                 gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_heigth-1)
                 # content
                 top = headers_heigth + 20
                 gc.stroke('transparent')
                 events.each do |i|
                   if i.is_a?(Issue)
                     i_start_date = (i.start_date >= date_from ? i.start_date : date_from )
                     i_end_date = (i.due_date <= date_to ? i.due_date : date_to )
                     i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
                     i_done_date = (i_done_date <= date_from ? date_from : i_done_date )
                     i_done_date = (i_done_date >= date_to ? date_to : i_done_date )
                     i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
                     i_left = subject_width + ((i_start_date - date_from)*zoom).floor
                     i_width = ((i_end_date - i_start_date + 1)*zoom).floor                  # total width of the issue
                     d_width = ((i_done_date - i_start_date)*zoom).floor                     # done width
                     l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor : 0 # delay width
                     gc.fill('grey')
                     gc.rectangle(i_left, top, i_left + i_width, top - 6)
                     gc.fill('red')
                     gc.rectangle(i_left, top, i_left + l_width, top - 6) if l_width > 0
                     gc.fill('blue')
                     gc.rectangle(i_left, top, i_left + d_width, top - 6) if d_width > 0
                     gc.fill('black')
                     gc.text(i_left + i_width + 5,top + 1, "#{i.status.name} #{i.done_ratio}%")
                   else
                     i_left = subject_width + ((i.start_date - date_from)*zoom).floor
                     gc.fill('green')
                     gc.rectangle(i_left, top, i_left + 6, top - 6)
                     gc.fill('black')
                     gc.text(i_left + 11, top + 1, i.name)
                   end
                   top = top + 20
                 end
                 # today red line
                 if Date.today >= @date_from and Date.today <= @date_to
                   gc.stroke('red')
                   x = (Date.today-@date_from+1)*zoom + subject_width
                   gc.line(x, headers_heigth, x, headers_heigth + g_height-1)
                 end
                 gc.draw(imgl)
                 imgl
               end if Object.const_defined?(:Magick)
               def new_issue_selector
                 trackers = Tracker.find(:all, :order => 'position')
                 # can't use form tag inside helper
                 content_tag('form',
-                  select_tag('tracker_id', '<option></option' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),
+                  select_tag('tracker_id', '<option></option>' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),
                   :action => url_for(:controller => 'projects', :action => 'add_issue', :id => @project), :method => 'get')
               end
             end

app/views/projects/list_issues.rhtml +2 -2

             <% if @query.new_record? %>
                 <div class="contextual">
                   <%= link_to l(:label_query_plural), :controller => 'queries', :project_id => @project %>
-                  <% if authorize_for('projects', 'add_issues') %>| <%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %>
+                  <% if authorize_for('projects', 'add_issue') %>| <%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %>
                 </div>
                 <h2><%=l(:label_issue_plural)%></h2>
                 <% form_tag({:action => 'list_issues'}, :id => 'query_form') do %>
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                 <% end %>
                 <div class="contextual">
                 <%= link_to_remote l(:button_apply),
                                    { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 },
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
                                    }, :class => 'icon icon-edit' %>
                 <%= link_to_remote l(:button_clear),
                                    { :url => {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1},
                                      :update => "content",
                                    }, :class => 'icon icon-reload'  %>
                 <% if current_role.allowed_to?(:save_queries) %>
                 <%= link_to_remote l(:button_save),
                                    { :url => { :controller => 'queries', :action => 'new', :project_id => @project },
                                      :method => 'get',
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
                                    }, :class => 'icon icon-save' %>
                 <% end %>
                 </div>
                 <br />
             <% else %>
                 <div class="contextual">
                     <%= link_to l(:label_query_plural), {:controller => 'queries', :project_id => @project} %> |
                     <%= link_to l(:label_issue_view_all), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1} %>
-                    <% if authorize_for('projects', 'add_issues') %>| <%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %>
+                    <% if authorize_for('projects', 'add_issue') %>| <%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %>
                 </div>
                 <h2><%= @query.name %></h2>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p><i><%= l(:label_no_data) %></i></p>
             <% else %>
             &nbsp;
             <% form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) do %>
             <table class="list">
                 <thead><tr>
                     <th></th>
             		<%= sort_header_tag("#{Issue.table_name}.id", :caption => '#') %>
             		<%= sort_header_tag("#{Issue.table_name}.tracker_id", :caption => l(:field_tracker)) %>
             		<%= sort_header_tag("#{IssueStatus.table_name}.name", :caption => l(:field_status)) %>
             		<%= sort_header_tag("#{Issue.table_name}.priority_id", :caption => l(:field_priority)) %>
             		<th><%=l(:field_subject)%></th>
             		<%= sort_header_tag("#{User.table_name}.lastname", :caption => l(:field_assigned_to)) %>
             		<%= sort_header_tag("#{Issue.table_name}.updated_on", :caption => l(:field_updated_on)) %>
             	</tr></thead>
             	<tbody>
             	<% for issue in @issues %>
             	<tr class="<%= cycle("odd", "even") %>">
             	    <th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th>
             		<td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center"><%= issue.tracker.name %></td>
             		<td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
             		<td align="center"><%= issue.priority.name %></td>
             		<td><%= "#{issue.project.name} - " unless @project && @project == issue.project %><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center"><%= issue.assigned_to.name if issue.assigned_to %></td>
             		<td align="center"><%= format_time(issue.updated_on) %></td>
             	</tr>
             	<% end %>
             	</tbody>
             </table>
             <div class="contextual">
             <%= l(:label_export_to) %>
             <%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>,
             <%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %>
             </div>
             <p><%= submit_tag l(:button_move), :class => "button-small" %>
             &nbsp;
             <%= pagination_links_full @issue_pages %>
             [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
             </p>
             <% end %>
             <% end %>
             <% end %>

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

             <div class="contextual">
             <%= link_to l(:label_feed_plural), {:action => 'feeds', :id => @project}, :class => 'icon icon-feed' %>
             </div>
             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
             	<%= textilizable @project.description %>
             	<ul>
             	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
             	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
             	<% unless @project.parent.nil? %>
             	<li><%=l(:field_parent)%>: <%= link_to @project.parent.name, :controller => 'projects', :action => 'show', :id => @project.parent %></li>
             	<% end %>
             	<% for custom_value in @custom_values %>
             	<% if !custom_value.value.empty? %>
             	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
             	<% end %>
             	<% end %>
             	</ul>
               <div class="box">
-                <div class="contextual"><% if authorize_for('projects', 'add_issues') %><%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %></div>
+                <div class="contextual"><% if authorize_for('projects', 'add_issue') %><%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %></div>
                 <h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
                   <%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %>
                   <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
                 <% end %>
                 </ul>
                 <p class="textcenter"><small><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></small></p>
               </div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
             		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>
             		<% @members_by_role.keys.sort.each do |role| %>
             		<%= role.name %>: <%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %><br />
             		<% end %>
             	</div>
               <% if @subprojects.any? %>
              	<div class="box">
             		<h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>
             		<%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %>
             	</div>
               <% end %>
               <% if @news.any? && authorize_for('projects', 'list_news') %>
               <div class="box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <%= render :partial => 'news/news', :collection => @news %>
                 <p class="textcenter"><small><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></small></p>
               </div>
               <% end %>
             </div>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:rss,  {:controller => 'feeds', :action => 'issues', :project_id => @project, :key => @key}, {:title => l(:label_reported_issues)}) %>
             <%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'issues', :project_id => @project, :key => @key, :format => 'atom'}, {:title => l(:label_reported_issues)}) %>
             <%= auto_discovery_link_tag(:rss,  {:controller => 'feeds', :action => 'history', :project_id => @project, :key => @key }, {:title => l(:label_changes_details)}) %>
             <%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'history', :project_id => @project, :key => @key, :format => 'atom'}, {:title => l(:label_changes_details)}) %>
             <%= auto_discovery_link_tag(:rss,  {:controller => 'feeds', :action => 'news', :project_id => @project, :key => @key}, {:title => l(:label_news_latest)}) %>
             <%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'news', :project_id => @project, :key => @key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
             <% 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