jro_apps/redmine Commit - r692:a19a0d7b9278

Subprojects are now grouped by projects in the 'Projects' top navigation drop-down menu....

Jean-Philippe Lang -

r692:a19a0d7b9278

parent child

Context file:

r692:a19a0d7b9278

Collapse all files

app/views/layouts/_projects_menu.rhtml created 644 +12 0

@@ -0,0 +1,12
	1	<div id="menuAllProjects" class="menu" onmouseover="menuMouseover(event)">
	2	<%= link_to l(:label_project_all), {:controller => 'projects' }, :class => "menuItem" %>
	3
	4	<% user_projects_by_root = User.current.projects.find(:all, :include => :parent, :limit => 20).group_by(&:root) %>
	5	<% user_projects_by_root.keys.sort.each do \|root\| %>
	6	<%= link_to root.name, {:controller => 'projects', :action => 'show', :id => root}, :class => "menuItem" %>
	7	<% user_projects_by_root[root].sort.each do \|project\| %>
	8	<% next if project == root %>
	9	<%= link_to(('» ' + project.name), {:controller => 'projects', :action => 'show', :id => project}, :class => "menuItem") %>
	10	<% end %>
	11	<% end %>
	12	</div>

app/models/project.rb +4 0

             # 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, :dependent => :delete_all, :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 :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_one :wiki, :dependent => :destroy
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :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
               attr_protected :status
               validates_presence_of :name, :description, :identifier
               validates_uniqueness_of :name, :identifier
               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 => 30
               validates_length_of :identifier, :in => 3..12
               validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
               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]
                 Issue.with_scope :find => { :conditions => conditions } do
                   yield
                 end
               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 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 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 <=> project.name
+              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
             end

app/views/layouts/base.rhtml +2 -12

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%= Setting.app_title + (@html_title ? ": #{@html_title}" : "") %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="<%= Redmine::Info.app_name %>" />
             <meta name="keywords" content="issue,bug,tracker" />
             <!--[if IE]>
                 <style type="text/css">
                 body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
                 </style>
             <![endif]-->
             <%= stylesheet_link_tag "application" %>
             <%= stylesheet_link_tag "print", :media => "print" %>
             <%= javascript_include_tag :defaults %>
             <%= javascript_include_tag 'menu' %>
             <%= stylesheet_link_tag 'jstoolbar' %>
             <!-- page specific tags --><%= yield :header_tags %>
             </head>
             <body>
             <div id="container" >
                 <div id="header">
                 <div style="float: left;">
                     <h1><%= Setting.app_title %></h1>
                     <h2><%= Setting.app_subtitle %></h2>
                 </div>
                 <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
                   <% if User.current.logged? %><small><%=l(:label_logged_as)%> <strong><%= User.current.login %></strong> -</small><% end %>
                   <small><%= toggle_link l(:label_search), 'quick-search-form', :focus => 'quick-search-input' %></small>
                   <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get, :id => 'quick-search-form', :style => "display:none;" ) do %>
                     <%= text_field_tag 'q', @question, :size => 15, :class => 'small', :id => 'quick-search-input' %>
                   <% end %>
                 </div>
                 </div>
             	<div id="navigation">
             		<ul>
             	<li><%= link_to l(:label_home), { :controller => 'welcome' }, :class => "icon icon-home" %></li>
             	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>
             	<% if User.current.memberships.any? %>
                   <li class="submenu"><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuAllProjects');" %></li>
             	<% else %>
             	  <li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>
             	<% end %>
                 <% if User.current.logged? %>
             		<li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "icon icon-user" %></li>
                 <% end %>
             	<% if User.current.admin? %>
             		<li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "icon icon-admin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
             	<% end %>
             	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :onclick => "window.open(this.href); return false;", :class => "icon icon-help" %></li>
             	<% if User.current.logged? %>
             		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "icon icon-user" %></li>
             	<% else %>
             		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "icon icon-user" %></li>
             	<% end %>
             		</ul>
             	</div>
-                <% if User.current.admin? %>
+                <%= render(:partial => 'admin/menu') if User.current.admin? %>
-            		<%= render :partial => 'admin/menu' %>
+                <%= render(:partial => 'layouts/projects_menu') if User.current.memberships.any? %>
-                <% end %>
-                <% if User.current.memberships.any? %>
-                    <div id="menuAllProjects" class="menu" onmouseover="menuMouseover(event)">
-                    <%= link_to l(:label_project_all), {:controller => 'projects' }, :class => "menuItem" %>
-                    <% User.current.memberships.find(:all, :limit => 20).each do |membership| %>
-                        <%= link_to membership.project.name, {:controller => 'projects',:action => 'show', :id => membership.project }, :class => "menuItem" %>
-                    <% end %>
-                    </div>
-                <% end %>
             	<div id="subcontent">
             		<% if @project && !@project.new_record? %>
             			<h2><%= @project.name %></h2>
             			<ul class="menublock">
                         <% Redmine::MenuManager.allowed_items(:project_menu, current_role).each do |item| %>
                         <% unless item.condition && !item.condition.call(@project) %>
                             <li><%= link_to l(item.name), {item.param => @project}.merge(item.url) %></li>
                         <% end %>
                         <% end %>
             			</ul>
             		<% end %>
             	</div>
             	<div id="content">
             	    <div id="flash">
             		  <%= content_tag('div', flash[:error], :class => 'error') if flash[:error] %>
             		  <%= content_tag('div', flash[:notice], :class => 'notice') if flash[:notice] %>
             		</div>
             		<%= yield %>
             	</div>
             	<div id="ajax-indicator" style="display:none;">
             	   <span><%= l(:label_loading) %></span>
             	</div>
             	<div id="footer">
             		<p><%= link_to Redmine::Info.app_name, Redmine::Info.url %> <small><%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang</small></p>
             	</div>
             </div>
             </body>
             </html>

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