jro_apps/redmine Commit - r3860:c7e719fc4b44

app/helpers/application_helper.rb +21 -6

                 link_to(text, {:controller => 'repositories', :action => 'revision', :id => project, :rev => revision}, :title => l(:label_revision_id, revision))
               end
+              # Generates a link to a project if active
+              # Examples:
+              #
+              #   link_to_project(project)                          # => link to the specified project overview
+              #   link_to_project(project, :action=>'settings')     # => link to project settings
+              #   link_to_project(project, {:only_path => false}, :class => "project") # => 3rd arg adds html options
+              #   link_to_project(project, {}, :class => "project") # => html options with default url (project overview)
+              #
+              def link_to_project(project, options={}, html_options = nil)
+                if project.active?
+                  url = {:controller => 'projects', :action => 'show', :id => project}.merge(options)
+                  link_to(h(project), url, html_options)
+                else
+                  h(project)
+                end
+              end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                   ancestors = (@project.root? ? [] : @project.ancestors.visible)
                   if ancestors.any?
                     root = ancestors.shift
-                    b << link_to(h(root), {:controller => 'projects', :action => 'show', :id => root, :jump => current_menu_item}, :class => 'root')
+                    b << link_to_project(root, {:jump => current_menu_item}, :class => 'root')
                     if ancestors.size > 2
                       b << '&#8230;'
                       ancestors = ancestors[-2, 2]
                     end
-                    b += ancestors.collect {|p| link_to(h(p), {:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item}, :class => 'ancestor') }
+                    b += ancestors.collect {|p| link_to_project(p, {:jump => current_menu_item}, :class => 'ancestor') }
                   end
                   b << h(@project)
                   b.join(' &#187; ')
                         end
                       when 'project'
                         if p = Project.visible.find_by_id(oid)
-                          link = link_to h(p.name), {:only_path => only_path, :controller => 'projects', :action => 'show', :id => p},
+                          link = link_to_project(p, {:only_path => only_path}, :class => 'project')
-                                                          :class => 'project'
                         end
                       end
                     elsif sep == ':'
                         end
                       when 'project'
                         if p = Project.visible.find(:first, :conditions => ["identifier = :s OR LOWER(name) = :s", {:s => name.downcase}])
-                          link = link_to h(p.name), {:only_path => only_path, :controller => 'projects', :action => 'show', :id => p},
+                          link = link_to_project(p, {:only_path => only_path}, :class => 'project')
-                                                          :class => 'project'
                         end
                       end
                     end

app/helpers/projects_helper.rb +1 -1

                     end
                     classes = (ancestors.empty? ? 'root' : 'child')
                     s << "<li class='#{classes}'><div class='#{classes}'>" +
-                           link_to(h(project), {:controller => 'projects', :action => 'show', :id => project}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
+                           link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
                     s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank?
                     s << "</div>\n"
                     ancestors << project

app/helpers/queries_helper.rb +1 -1

                 when 'User'
                   link_to_user value
                 when 'Project'
-                  link_to(h(value), :controller => 'projects', :action => 'show', :id => value)
+                  link_to_project value
                 when 'Version'
                   link_to(h(value), :controller => 'versions', :action => 'show', :id => value)
                 when 'TrueClass'

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

               <tbody>
             <% project_tree(@projects) do |project, level| %>
               <tr class="<%= cycle("odd", "even") %> <%= css_project_classes(project) %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-            	<td class="name"><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %></td>
+            	<td class="name"><%= link_to_project(project, :action => 'settings') %></td>
             	<td><%= textilizable project.short_description, :project => project %></td>
             	<td align="center"><%= checked_image project.is_public? %></td>
             	<td align="center"><%= format_date(project.created_on) %></td>

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

             			  <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;') %>
             				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
             			</td>
-            			<td class="project"><%= link_to(h(issue.project), :controller => 'projects', :action => 'show', :id => issue.project) %></td>
+            			<td class="project"><%= link_to_project(issue.project) %></td>
             			<td class="tracker"><%=h issue.tracker %></td>
             			<td class="subject">
                     <%= link_to h(truncate(issue.subject, :length => 60)), :controller => 'issues', :action => 'show', :id => issue %> (<%=h issue.status %>)

app/views/news/_news.rhtml +1 -1

-            <p><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %>
+            <p><%= link_to_project(news.project) + ': ' unless @project %>
             <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
             <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
             <br />

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

             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <% @newss.each do |news| %>
-                <h3><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless news.project == @project %>
+                <h3><%= link_to_project(news.project) + ': ' unless news.project == @project %>
                 <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
                 <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
                 <p class="author"><%= authoring news.created_on, news.author %></p>

app/views/users/_memberships.rhtml +1 -1

             	<% next if membership.new_record? %>
             	<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
               <td class="project">
-                <%= link_to h(membership.project), {:controller => 'projects', :action => 'show', :id => membership.project} %>
+                <%= link_to_project membership.project %>
               </td>
               <td class="roles">
                 <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>

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

             <h3><%=l(:label_project_plural)%></h3>
             <ul>
             <% for membership in @memberships %>
-            	<li><%= link_to(h(membership.project.name), :controller => 'projects', :action => 'show', :id => membership.project) %>
+            	<li><%= link_to_project(membership.project) %>
                 (<%=h membership.roles.sort.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)</li>
             <% end %>
             </ul>

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

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

test/unit/helpers/application_helper_test.rb +12 0

@@ -597,4 +597,16 EXPECTED
597	t = link_to_user(user)	597	t = link_to_user(user)
598	assert_equal ::I18n.t(:label_user_anonymous), t	598	assert_equal ::I18n.t(:label_user_anonymous), t
599	end	599	end
		600
		601	def test_link_to_project
		602	project = Project.find(1)
		603	assert_equal %(<a href="/projects/ecookbook">eCookbook</a>),
		604	link_to_project(project)
		605	assert_equal %(<a href="/projects/ecookbook/settings">eCookbook</a>),
		606	link_to_project(project, :action => 'settings')
		607	assert_equal %(<a href="http://test.host/projects/ecookbook?jump=blah">eCookbook</a>),
		608	link_to_project(project, {:only_path => false, :jump => 'blah'})
		609	assert_equal %(<a href="/projects/ecookbook/settings" class="project">eCookbook</a>),
		610	link_to_project(project, {:action => 'settings'}, :class => "project")
		611	end
600	end	612	end

	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