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

Collapse all files

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

             # 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 Project < ActiveRecord::Base
               # Project statuses
               STATUS_ACTIVE     = 1
               STATUS_ARCHIVED   = 9
               has_many :members, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
               has_many :users, :through => :members
               has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_many :enabled_modules, :dependent => :delete_all
               has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
               has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
               has_many :issue_changes, :through => :issues, :source => :journals
               has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
               has_many :time_entries, :dependent => :delete_all
               has_many :queries, :dependent => :delete_all
               has_many :documents, :dependent => :destroy
               has_many :news, :dependent => :delete_all, :include => :author
               has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
               has_many :boards, :order => "position ASC"
               has_one :repository, :dependent => :destroy
               has_many :changesets, :through => :repository
               has_one :wiki, :dependent => :destroy
               # Custom field for the project issues
               has_and_belongs_to_many :custom_fields,
                                       :class_name => 'IssueCustomField',
                                       :order => "#{CustomField.table_name}.position",
                                       :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
                                       :association_foreign_key => 'custom_field_id'
               acts_as_tree :order => "name", :counter_cache => true
               acts_as_searchable :columns => ['name', 'description'], :project_key => 'id'
               acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
                             :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}}
               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\-]*$/
               before_destroy :delete_all_members
               def identifier=(identifier)
                 super unless identifier_frozen?
               end
               def identifier_frozen?
                 errors[:identifier].nil? && !(new_record? || identifier.blank?)
               end
               def issues_with_subprojects(include_subprojects=false)
                 conditions = nil
                 if include_subprojects && !active_children.empty?
                   ids = [id] + active_children.collect {|c| c.id}
                   conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
                 end
                 conditions ||= ["#{Issue.table_name}.project_id = ?", id]
                 # Quick and dirty fix for Rails 2 compatibility
                 Issue.send(:with_scope, :find => { :conditions => conditions }) do
                   yield
                 end
               end
               # Return all issues status changes for the project between the 2 given dates
               def issues_status_changes(from, to)
                 Journal.find(:all, :include => [:issue, :details, :user],
                                    :conditions => ["#{Journal.table_name}.journalized_type = 'Issue'" +
                                                    " AND #{Issue.table_name}.project_id = ?" +
                                                    " AND #{JournalDetail.table_name}.prop_key = 'status_id'" +
                                                    " AND #{Journal.table_name}.created_on BETWEEN ? AND ?",
                                                    id, from, to+1])
               end
               # returns latest created projects
               # non public projects will be returned only if user is a member of those
               def self.latest(user=nil, count=5)
                 find(:all, :limit => count, :conditions => visible_by(user), :order => "created_on DESC")
               end
               def self.visible_by(user=nil)
                 if user && user.admin?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 elsif user && user.memberships.any?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
                 else
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
                 end
               end
               def self.find(*args)
                 if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
                   project = find_by_identifier(*args)
                   raise ActiveRecord::RecordNotFound, "Couldn't find Project with identifier=#{args.first}" if project.nil?
                   project
                 else
                   super
                 end
               end
               def to_param
                 identifier
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def archive
                 # Archive subprojects if any
                 children.each do |subproject|
                   subproject.archive
                 end
                 update_attribute :status, STATUS_ARCHIVED
               end
               def unarchive
                 return false if parent && !parent.active?
                 update_attribute :status, STATUS_ACTIVE
               end
               def active_children
                 children.select {|child| child.active?}
               end
               # Returns an array of the trackers used by the project and its sub projects
               def rolled_up_trackers
                 @rolled_up_trackers ||=
                   Tracker.find(:all, :include => :projects,
                                      :select => "DISTINCT #{Tracker.table_name}.*",
                                      :conditions => ["#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?", id, id],
                                      :order => "#{Tracker.table_name}.position")
               end
               # Deletes all project's members
               def delete_all_members
                 Member.delete_all(['project_id = ?', id])
               end
               # Users issues can be assigned to
               def assignable_users
                 members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort
               end
               # Returns the mail adresses of users that should be always notified on project events
               def recipients
                 members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
               end
               # Returns an array of all custom fields enabled for project issues
               # (explictly associated custom fields and custom fields enabled for all projects)
               def custom_fields_for_issues(tracker)
                 all_custom_fields.select {|c| tracker.custom_fields.include? c }
               end
               def all_custom_fields
                 @all_custom_fields ||= (IssueCustomField.for_all + custom_fields).uniq
               end
               def <=>(project)
                 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]}"
                 else
                   allowed_permissions.include? action
                 end
               end
               def module_enabled?(module_name)
                 module_name = module_name.to_s
                 enabled_modules.detect {|m| m.name == module_name}
               end
               def enabled_module_names=(module_names)
                 enabled_modules.clear
                 module_names = [] unless module_names && module_names.is_a?(Array)
                 module_names.each do |name|
                   enabled_modules << EnabledModule.new(:name => name.to_s)
                 end
               end
             protected
               def validate
                 errors.add(parent_id, " must be a root project") if parent and parent.parent
                 errors.add_to_base("A project with subprojects can't be a subproject") if parent and children.size > 0
               end
             private
               def allowed_permissions
                 @allowed_permissions ||= begin
                   module_names = enabled_modules.collect {|m| m.name}
                   Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
                 end
               end
               def allowed_actions
                 @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
               end
             end

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

             <div class="contextual">
             <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_project_plural)%></h2>
             <% form_tag() do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label><%= l(:field_status) %> :</label>
             <%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             <%= submit_tag l(:button_apply), :class => "small" %>
             </fieldset>
             <% end %>
             &nbsp;
             <table class="list">
               <thead><tr>
             	<%= sort_header_tag('name', :caption => l(:label_project)) %>
             	<th><%=l(:field_description)%></th>
             	<th><%=l(:field_is_public)%></th>
             	<th><%=l(:label_subproject_plural)%></th>
             	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
                 <th></th>
                 <th></th>
               </tr></thead>
               <tbody>
             <% 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) %>
               <td align="center" style="width:10%">
                 <small>
                 <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
                 <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
                 </small>
               </td>
               <td align="center" style="width:10%">
                 <small><%= link_to(l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => 'icon icon-del') %></small>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @project_pages, @project_count %></p>
             <% html_title(l(:label_project_plural)) -%>

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

             <%= error_messages_for 'project' %>
             <div class="box">
             <!--[form:project]-->
             <p><%= f.text_field :name, :required => true %><br /><em><%= l(:text_caracters_maximum, 30) %></em></p>
             <% if User.current.admin? and !@root_projects.empty? %>
                 <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' %>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             </div>
             <% unless @trackers.empty? %>
             <fieldset class="box"><legend><%=l(:label_tracker_plural)%></legend>
             <% @trackers.each do |tracker| %>
                 <label class="floating">
                 <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
                 <%= tracker %>
                 </label>
             <% end %>
             <%= hidden_field_tag 'project[tracker_ids][]', '' %>
             </fieldset>
             <% end %>
             <% unless @custom_fields.empty? %>
             <fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
             <% for custom_field in @custom_fields %>
                 <label class="floating">
             	<%= check_box_tag 'project[custom_field_ids][]', custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
             	<%= custom_field.name %>
             	</label>
             <% end %>
             <%= hidden_field_tag 'project[custom_field_ids][]', '' %>
             </fieldset>
             <% end %>
             <!--[eoform:project]-->
             <% content_for :header_tags do %>
             <%= javascript_include_tag 'calendar/calendar' %>
             <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
             <%= javascript_include_tag 'calendar/calendar-setup' %>
             <%= stylesheet_link_tag 'calendar' %>
             <% end %>

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

             <h2><%=l(:label_project_plural)%></h2>
             <% @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) %>:
                 <%= @project_tree[project].sort.collect {|subproject|
                    link_to(h(subproject.name), {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %></p>
             <% end %>
             <% end %>
             <% if User.current.logged? %>
             <div class="contextual">
             <span class="icon icon-fav"><%= l(:label_my_projects) %></span>
             </div>
             <% end %>
             <% html_title(l(:label_project_plural)) -%>

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

             <h2><%= l(:label_home) %></h2>
             <div class="splitcontentleft">
               <%= textilizable Setting.welcome_text %>
               <% if @news.any? %>
               <div class="box">
             	<h3><%=l(:label_news_latest)%></h3>
             		<%= render :partial => 'news/news', :collection => @news %>
             		<%= link_to l(:label_news_view_all), :controller => 'news' %>
               </div>
               <% end %>
             </div>
             <div class="splitcontentright">
             	<div class="box">
             	<h3 class="icon22 icon22-projects"><%=l(:label_project_latest)%></h3>
             		<ul>
             		<% 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>
             	</div>
             </div>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_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