Skip to content

O
OHR Support
Commit a4d7a03b authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

SCM browser: 

* don't show repository commits when showing a subfolder
* remove obsolete view browse.rhtml

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2843 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 6fb80efd
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 17 deletions
app/controllers/repositories_controller.rb
View file @ a4d7a03b
# redMine - project management software
# Copyright (C) 2006-2007 Jean-Philippe Lang
# Redmine - project management software
# Copyright (C) 2006-2009 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
......@@ -72,7 +72,9 @@ class RepositoriesController < ApplicationController
@entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
else
show_error_not_found and return unless @entries
@changesets = @repository.latest_changesets(@path, @rev)
if @path.blank?
@changesets = @repository.latest_changesets(@path, @rev)
end
@properties = @repository.properties(@path, @rev)
render :action => 'show'
end
......@@ -108,7 +110,7 @@ class RepositoriesController < ApplicationController
show_error_not_found and return unless @entry
# If the entry is a dir, show the browser
browse and return if @entry.is_dir?
show and return if @entry.is_dir?
@content = @repository.cat(@path, @rev)
show_error_not_found and return unless @content
......
app/views/repositories/browse.rhtml deleted 100644 → 0
View file @ 6fb80efd
<div class="contextual">
<%= render :partial => 'navigation' %>
</div>
<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
<%= render :partial => 'dir_list' %>
<%= render_properties(@properties) %>
<% content_for :header_tags do %>
<%= stylesheet_link_tag "scm" %>
<% end %>
app/views/repositories/show.rhtml
View file @ a4d7a03b
......@@ -10,7 +10,9 @@
<%= render :partial => 'dir_list' %>
<% end %>
<% if !@changesets.empty? && authorize_for('repositories', 'revisions') %>
<%= render_properties(@properties) %>
<% if @changesets && !@changesets.empty? && authorize_for('repositories', 'revisions') %>
<h3><%= l(:label_latest_revision_plural) %></h3>
<%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%>
<p><%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project %></p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment