jro_apps/redmine Commit - r1074:df99d8f30801

Unlimited and optional project description. The project list will show truncated descriptions only (the first fews lines)....

Jean-Philippe Lang -

r1074:df99d8f30801

parent child

Context file:

r1074:df99d8f30801

db/migrate/087_change_projects_description_to_text.rb created 644 +8 0

@@ -0,0 +1,8
	1	class ChangeProjectsDescriptionToText < ActiveRecord::Migration
	2	def self.up
	3	change_column :projects, :description, :text, :default => ''
	4	end
	5
	6	def self.down
	7	end
	8	end

app/models/project.rb +10 -2

               attr_protected :status, :enabled_module_names
-              validates_presence_of :name, :description, :identifier
+              validates_presence_of :name, :identifier
               validates_uniqueness_of :name, :identifier
               validates_associated :custom_values, :on => :update
               validates_associated :repository, :wiki
               validates_length_of :name, :maximum => 30
-              validates_length_of :description, :maximum => 255
               validates_length_of :homepage, :maximum => 60
               validates_length_of :identifier, :in => 3..20
               validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
                 name.downcase <=> project.name.downcase
               end
+              def to_s
+                name
+              end
+              # Returns a short description of the projects (first lines)
+              def short_description(length = 255)
+                description.gsub(/^(.{#{length}}[^\n]*).*$/m, '\1').strip if description
+              end
               def allows_to?(action)
                 if action.is_a? Hash
                   allowed_actions.include? "#{action[:controller]}/#{action[:action]}"

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

             <% for project in @projects %>
               <tr class="<%= cycle("odd", "even") %>">
             	<td><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
-            	<td><%= textilizable project.description, :project => project %>
+            	<td><%= textilizable project.short_description, :project => project %>
             	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
             	<td align="center"><%= project.children.size %>
             	<td align="center"><%= format_date(project.created_on) %>

app/views/projects/_form.rhtml +5 -2

                 <p><%= f.select :parent_id, (@root_projects.collect {|p| [p.name, p.id]}), { :include_blank => true } %></p>
             <% end %>
-            <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 5 %><em><%= l(:text_caracters_maximum, 255) %></em></p>
+            <p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></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 :identifier, :required => true, :disabled => @project.identifier_frozen? %>
+            <% unless @project.identifier_frozen? %>
+            <br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) %></em>
+            <% end %></p>
             <p><%= f.text_field :homepage, :size => 40 %></p>
             <p><%= f.check_box :is_public %></p>
             <%= wikitoolbar_for 'project_description' %>

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

             <% @project_tree.keys.sort.each do |project| %>
             <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) %>
+            <%= textilizable(project.short_description, :project => project) %>
             <% if @project_tree[project].any? %>
                 <p><%= l(:label_subproject_plural) %>:

app/views/welcome/index.rhtml +1 -1

             		<% for project in @projects %>
             			<li>
             			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
-            			<%= textilizable project.description, :project => project %>
+            			<%= textilizable project.short_description, :project => project %>
             			</li>
             		<% end %>
             		</ul>

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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