summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-12-03 10:28:08 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-12-03 10:28:08 +0000
commit92a23c05bb71e62426cec2298d90b39fadd0eb52 (patch)
tree87093cc5919c75b4a34392cad6176e9ebf639059 /app
parent7d8af70a6362517cab9aa2dc2054fa8dd8581ad8 (diff)
downloadredmine-92a23c05bb71e62426cec2298d90b39fadd0eb52.tar.gz
redmine-92a23c05bb71e62426cec2298d90b39fadd0eb52.zip
Project name format limitation removed (name can now contain any character).
Project identifier maximum length changed from 12 to 20. git-svn-id: http://redmine.rubyforge.org/svn/trunk@949 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects_controller.rb8
-rw-r--r--app/helpers/queries_helper.rb2
-rw-r--r--app/models/project.rb3
-rw-r--r--app/views/admin/projects.rhtml2
-rw-r--r--app/views/issues/_list_simple.rhtml2
-rw-r--r--app/views/layouts/_project_selector.rhtml4
-rw-r--r--app/views/my/account.rhtml2
-rw-r--r--app/views/projects/_form.rhtml2
-rw-r--r--app/views/projects/destroy.rhtml2
-rw-r--r--app/views/projects/gantt.rhtml4
-rw-r--r--app/views/projects/list.rhtml4
-rw-r--r--app/views/projects/show.rhtml4
12 files changed, 21 insertions, 18 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 37a788690..658e9d232 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -58,7 +58,9 @@ class ProjectsController < ApplicationController
def add
@custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
@trackers = Tracker.all
- @root_projects = Project.find(:all, :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}")
+ @root_projects = Project.find(:all,
+ :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
+ :order => 'name')
@project = Project.new(params[:project])
@project.enabled_module_names = Redmine::AccessControl.available_project_modules
if request.get?
@@ -90,7 +92,9 @@ class ProjectsController < ApplicationController
end
def settings
- @root_projects = Project::find(:all, :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id])
+ @root_projects = Project.find(:all,
+ :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
+ :order => 'name')
@custom_fields = IssueCustomField.find(:all)
@issue_category ||= IssueCategory.new
@member ||= @project.members.new
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index f92787278..3011d3aec 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -38,7 +38,7 @@ module QueriesHelper
else
case column.name
when :subject
- ((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
+ h((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
when :done_ratio
progress_bar(value, :width => '80px')
diff --git a/app/models/project.rb b/app/models/project.rb
index 03ada035c..5788732d7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -57,10 +57,9 @@ class Project < ActiveRecord::Base
validates_associated :custom_values, :on => :update
validates_associated :repository, :wiki
validates_length_of :name, :maximum => 30
- validates_format_of :name, :with => /^[\w\s\'\-]*$/i
validates_length_of :description, :maximum => 255
validates_length_of :homepage, :maximum => 60
- validates_length_of :identifier, :in => 3..12
+ validates_length_of :identifier, :in => 3..20
validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
def identifier=(identifier)
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index d231be102..423d56ebe 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -26,7 +26,7 @@
<tbody>
<% for project in @projects %>
<tr class="<%= cycle("odd", "even") %>">
- <td><%= project.active? ? link_to(project.name, :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
+ <td><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
<td><%= textilizable project.description, :project => project %>
<td align="center"><%= image_tag 'true.png' if project.is_public? %>
<td align="center"><%= project.children.size %>
diff --git a/app/views/issues/_list_simple.rhtml b/app/views/issues/_list_simple.rhtml
index 517055e3a..eb93f8ea1 100644
--- a/app/views/issues/_list_simple.rhtml
+++ b/app/views/issues/_list_simple.rhtml
@@ -11,7 +11,7 @@
<td class="id">
<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
</td>
- <td><%= issue.project.name %> - <%= issue.tracker.name %><br />
+ <td><%=h issue.project.name %> - <%= issue.tracker.name %><br />
<%= issue.status.name %> - <%= format_time(issue.updated_on) %></td>
<td class="subject">
<%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %>
diff --git a/app/views/layouts/_project_selector.rhtml b/app/views/layouts/_project_selector.rhtml
index 499879c8c..ce2f15e03 100644
--- a/app/views/layouts/_project_selector.rhtml
+++ b/app/views/layouts/_project_selector.rhtml
@@ -3,10 +3,10 @@
<option selected><%= l(:label_jump_to_a_project) %></option>
<option disabled>---</option>
<% user_projects_by_root.keys.sort.each do |root| %>
- <%= content_tag('option', root.name, :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
+ <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
<% user_projects_by_root[root].sort.each do |project| %>
<% next if project == root %>
- <%= content_tag('option', ('&#187; ' + project.name), :value => url_for(:controller => 'projects', :action => 'show', :id => project)) %>
+ <%= content_tag('option', ('&#187; ' + h(project.name)), :value => url_for(:controller => 'projects', :action => 'show', :id => project)) %>
<% end %>
<% end %>
</select>
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index e64051771..2dda62d70 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -29,7 +29,7 @@
:onchange => 'if ($("notification_option").value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>
<% content_tag 'div', :id => 'notified-projects', :style => (@notification_option == 'selected' ? '' : 'display:none;') do %>
<p><% User.current.projects.each do |project| %>
- <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%= project.name %></label><br />
+ <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %></label><br />
<% end %></p>
<p><em><%= l(:text_user_mail_option) %></em></p>
<% end %>
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index 885ccf4bd..e29777af4 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -9,7 +9,7 @@
<% end %>
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 5 %><em><%= l(:text_caracters_maximum, 255) %></em></p>
-<p><%= f.text_field :identifier, :required => true, :size => 15, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_length_between, 3, 12) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p>
+<p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p>
<p><%= f.text_field :homepage, :size => 40 %></p>
<p><%= f.check_box :is_public %></p>
<%= wikitoolbar_for 'project_description' %>
diff --git a/app/views/projects/destroy.rhtml b/app/views/projects/destroy.rhtml
index 8ef23197d..4531cb845 100644
--- a/app/views/projects/destroy.rhtml
+++ b/app/views/projects/destroy.rhtml
@@ -1,7 +1,7 @@
<h2><%=l(:label_confirmation)%></h2>
<div class="box">
<center>
-<p><strong><%= @project_to_destroy.name %></strong><br />
+<p><strong><%=h @project_to_destroy.name %></strong><br />
<%=l(:text_project_destroy_confirmation)%></p>
<p>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 21ef600a8..a66754842 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -72,8 +72,8 @@ top = headers_height + 8
@events.each do |i| %>
<div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
<% if i.is_a? Issue %>
- <%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>:
- <%=h i.subject %>
+ <%= h("#{i.project.name} -") unless @project && @project == i.project %>
+ <%= link_to_issue i %>: <%=h i.subject %>
<% else %>
<%= link_to_version i, :class => "icon icon-package" %>
<% end %>
diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml
index 51c1b544a..c6e5b4dec 100644
--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
@@ -1,13 +1,13 @@
<h2><%=l(:label_project_plural)%></h2>
<% @project_tree.keys.sort.each do |project| %>
-<h3><%= link_to project.name, {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %></h3>
+<h3><%= link_to h(project.name), {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %></h3>
<%= textilizable(project.description, :project => project) %>
<% if @project_tree[project].any? %>
<p><%= l(:label_subproject_plural) %>:
<%= @project_tree[project].sort.collect {|subproject|
- link_to(subproject.name, {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %></p>
+ link_to(h(subproject.name), {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %></p>
<% end %>
<% end %>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 458e7975e..bb01df1f4 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -5,10 +5,10 @@
<ul>
<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
<% if @subprojects.any? %>
- <li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %></li>
+ <li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(h(p.name), :action => 'show', :id => p)}.join(", ") %></li>
<% end %>
<% if @project.parent %>
- <li><%=l(:field_parent)%>: <%= link_to @project.parent.name, :controller => 'projects', :action => 'show', :id => @project.parent %></li>
+ <li><%=l(:field_parent)%>: <%= link_to h(@project.parent.name), :controller => 'projects', :action => 'show', :id => @project.parent %></li>
<% end %>
<% for custom_value in @custom_values %>
<% if !custom_value.value.empty? %>