jro_apps/redmine Commit - r431:183ede84fd80

Various changes on views. On project summary, members are now grouped by role and subprojects are listed inline....

Jean-Philippe Lang -

r431:183ede84fd80

parent child

Context file:

r431:183ede84fd80

app/controllers/projects_controller.rb +1 -1

               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
-                @members = @project.members.find(:all, :include => [:user, :role], :order => 'position')
+                @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.children if @project.children.size > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = Tracker.find(:all, :order => 'position')

app/controllers/roles_controller.rb +2 -2

               end
               def list
-                @role_pages, @roles = paginate :roles, :per_page => 10, :order => "position"
+                @role_pages, @roles = paginate :roles, :per_page => 25, :order => "position"
                 render :action => "list", :layout => false if request.xhr?
               end
               end
               def report
-                @roles = Role.find :all
+                @roles = Role.find(:all, :order => 'position')
                 @permissions = Permission.find :all, :conditions => ["is_public=?", false], :order => 'sort'
                 if request.post?
                   @roles.each do |role|

app/models/role.rb +4 0

               validates_uniqueness_of :name
               validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+              def <=>(role)
+                position <=> role.position
+              end
             private
               def check_integrity
                 raise "Can't delete role" if Member.find(:first, :conditions =>["role_id=?", self.id])

app/models/user.rb +4 0

                 token && token.user.active? ? token.user : nil
               end
+              def <=>(user)
+                lastname <=> user.lastname
+              end
             private
               # Return password digest
               def self.hash_password(clear_password)

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

                 <td style="width:15%"><b><%=l(:field_priority)%> :</b></td><td style="width:35%"><%= @issue.priority.name %></td>
             </tr>
             <tr>
-                <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? @issue.assigned_to.name : "-" %></td>
+                <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
                 <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
             </tr>
             <tr>

app/views/projects/show.rhtml +4 -6

             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
-            	<%= simple_format(auto_link(h(@project.description))) %>
+            	<%= textilizable @project.description %>
             	<ul>
             	<% unless @project.homepage.empty? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
             	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
             <div class="splitcontentright">
             	<div class="box">
             		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>
-            		<% for member in @members %>
+            		<% @members_by_role.keys.sort.each do |role| %>
-            		<%= link_to_user member.user %> (<%= member.role.name %>)<br />
+            		<%= role.name %>: <%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %><br />
             		<% end %>
             	</div>
               <% if @subprojects %>
              	<div class="box">
             		<h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>
-            		<% for subproject in @subprojects %>
+            		<%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %>
-            		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />
-            		<% end %>
             	</div>
               <% end %>

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