jro_apps/redmine Commit - r1517:9c5ec2974d1b

Merged r1503 from trunk....

Jean-Philippe Lang -

r1517:9c5ec2974d1b

parent child

Context file:

r1517:9c5ec2974d1b

Collapse all files

app/models/enumeration.rb 0 -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 Enumeration < ActiveRecord::Base
               acts_as_list :scope => 'opt = \'#{opt}\''
               before_destroy :check_integrity
               validates_presence_of :opt, :name
               validates_uniqueness_of :name, :scope => [:opt]
               validates_length_of :name, :maximum => 30
-              validates_format_of :name, :with => /^[\w\s\'\-]*$/i
               OPTIONS = {
                 "IPRI" => :enumeration_issue_priorities,
                 "DCAT" => :enumeration_doc_categories,
                 "ACTI" => :enumeration_activities
               }.freeze
               def self.get_values(option)
                 find(:all, :conditions => {:opt => option}, :order => 'position')
               end
               def self.default(option)
                 find(:first, :conditions => {:opt => option, :is_default => true}, :order => 'position')
               end
               def option_name
                 OPTIONS[self.opt]
               end
               def before_save
                 Enumeration.update_all("is_default = #{connection.quoted_false}", {:opt => opt}) if is_default?
               end
               def <=>(enumeration)
                 position <=> enumeration.position
               end
               def to_s; name end
             private
               def check_integrity
                 case self.opt
                 when "IPRI"
                   raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
                 when "DCAT"
                   raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
                 when "ACTI"
                   raise "Can't delete enumeration" if TimeEntry.find(:first, :conditions => ["activity_id=?", self.id])
                 end
               end
             end

app/views/enumerations/list.rhtml +1 -1

             <h2><%=l(:label_enumerations)%></h2>
             <% Enumeration::OPTIONS.each do |option, name| %>
             <h3><%= l(name) %></h3>
             <% enumerations = Enumeration.get_values(option) %>
             <% if enumerations.any? %>
             <table class="list">
             <% enumerations.each do |enumeration| %>
             <tr class="<%= cycle('odd', 'even') %>">
-                <td><%= link_to enumeration.name, :action => 'edit', :id => enumeration %></td>
+                <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
                 <td style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
                 <td style="width:15%;">
                 <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => enumeration, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
                 <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => enumeration, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
                 <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => enumeration, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
                 <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => enumeration, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
                 </td>
             </tr>
             <% end %>
             </table>
             <% reset_cycle %>
             <% end %>
             <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option } %></p>
             <% end %>
             <% html_title(l(:label_enumerations)) -%>

app/views/timelog/_report_criteria.rhtml +1 -1

             <% @hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %>
             <% hours_for_value = select_hours(hours, criterias[level], value) -%>
             <% next if hours_for_value.empty? -%>
             <tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>">
             <%= '<td></td>' * level %>
-            <td><%= format_criteria_value(criterias[level], value) %></td>
+            <td><%= h(format_criteria_value(criterias[level], value)) %></td>
             <%= '<td></td>' * (criterias.length - level - 1) -%>
               <% total = 0 -%>
               <% @periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)); total += sum -%>
                 <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
               <% end -%>
               <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
             </tr>
             <% if criterias.length > level+1 -%>
               <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
             <% end -%>
             <% 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