Commit f3fcffb40ea1513594f2d39389931f512ce3f9e2
- Date: Sat Jan 12 22:16:24 +0000 2008
- Committer: Johan Sørensen (johan@johansorensen.com)
- Author: Johan Sørensen (johan@johansorensen.com)
- Commit SHA1: f3fcffb40ea1513594f2d39389931f512ce3f9e2
- Tree SHA1: cc59d7ef10c29b5e1c35d850713117329693c748
Fixed Atom url generation
Commit diff
| | |
| 12 | 12 | end |
| 13 | 13 | end |
| 14 | 14 | # TODO: Patch rails to keep track of what it responds to so we can DRY this up |
| 15 | | @atom_auto_discovery = true |
| 15 | @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom) |
| 16 | 16 | respond_to do |format| |
| 17 | 17 | format.html |
| 18 | 18 | format.atom |
| toggle raw diff |
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -12,7 +12,7 @@ class BrowseController < ApplicationController
end
end
# TODO: Patch rails to keep track of what it responds to so we can DRY this up
- @atom_auto_discovery = true
+ @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
respond_to do |format|
format.html
format.atom |
| | |
| 5 | 5 | |
| 6 | 6 | def index |
| 7 | 7 | @comments = @repository.comments.find(:all, :include => :user) |
| 8 | | @atom_auto_discovery = true |
| 8 | @atom_auto_discovery_url = formatted_project_repository_comments_path(@project, @repository, :atom) |
| 9 | 9 | respond_to do |format| |
| 10 | 10 | format.html { } |
| 11 | 11 | format.atom { } |
| toggle raw diff |
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -5,7 +5,7 @@ class CommentsController < ApplicationController
def index
@comments = @repository.comments.find(:all, :include => :user)
- @atom_auto_discovery = true
+ @atom_auto_discovery_url = formatted_project_repository_comments_path(@project, @repository, :atom)
respond_to do |format|
format.html { }
format.atom { } |
| | |
| 5 | 5 | def index |
| 6 | 6 | @projects = Project.paginate(:all, :order => "created_at desc", |
| 7 | 7 | :page => params[:page]) |
| 8 | | @atom_auto_discovery = true |
| 8 | @atom_auto_discovery_url = formatted_projects_path(:atom) |
| 9 | 9 | respond_to do |format| |
| 10 | 10 | format.html { @tags = Project.tag_counts } |
| 11 | 11 | format.xml { render :xml => @projects } |
| … | … | |
| 17 | 17 | tags = params[:id].to_s.gsub(/,\ ?/, " ") |
| 18 | 18 | @projects = Project.paginate_by_tag(tags, :order => 'created_at desc', |
| 19 | 19 | :page => params[:page]) |
| 20 | | @atom_auto_discovery = true |
| 20 | @atom_auto_discovery_url = formatted_projects_category_path(params[:id], :atom) |
| 21 | 21 | respond_to do |format| |
| 22 | 22 | format.html do |
| 23 | 23 | @tags = Project.tag_counts |
| toggle raw diff |
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -5,7 +5,7 @@ class ProjectsController < ApplicationController
def index
@projects = Project.paginate(:all, :order => "created_at desc",
:page => params[:page])
- @atom_auto_discovery = true
+ @atom_auto_discovery_url = formatted_projects_path(:atom)
respond_to do |format|
format.html { @tags = Project.tag_counts }
format.xml { render :xml => @projects }
@@ -17,7 +17,7 @@ class ProjectsController < ApplicationController
tags = params[:id].to_s.gsub(/,\ ?/, " ")
@projects = Project.paginate_by_tag(tags, :order => 'created_at desc',
:page => params[:page])
- @atom_auto_discovery = true
+ @atom_auto_discovery_url = formatted_projects_category_path(params[:id], :atom)
respond_to do |format|
format.html do
@tags = Project.tag_counts |
| | |
| 18 | 18 | @commits = [] |
| 19 | 19 | end |
| 20 | 20 | |
| 21 | | @atom_auto_discovery = true |
| 21 | @atom_auto_discovery_url = formatted_project_repository_path(@project, @repository, :atom) |
| 22 | 22 | respond_to do |format| |
| 23 | 23 | format.html |
| 24 | 24 | format.xml { render :xml => @repository } |
| toggle raw diff |
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -18,7 +18,7 @@ class RepositoriesController < ApplicationController
@commits = []
end
- @atom_auto_discovery = true
+ @atom_auto_discovery_url = formatted_project_repository_path(@project, @repository, :atom)
respond_to do |format|
format.html
format.xml { render :xml => @repository } |
| | |
| 7 | 7 | <meta name="author" content="Johan Sørensen"> |
| 8 | 8 | <%= stylesheet_link_tag "base" -%> |
| 9 | 9 | <%= javascript_include_tag :defaults, :cache => true -%> |
| 10 | | <% if @atom_auto_discovery -%> |
| 11 | | <%= auto_discovery_link_tag(:atom, :format => :atom) -%> |
| 10 | <% if @atom_auto_discovery_url -%> |
| 11 | <%= auto_discovery_link_tag(:atom, @atom_auto_discovery_url) -%> |
| 12 | 12 | <% end -%> |
| 13 | 13 | <%= GitoriousConfig["extra_html_head_data"] -%> |
| 14 | 14 | </head> |
| toggle raw diff |
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -7,8 +7,8 @@
<meta name="author" content="Johan Sørensen">
<%= stylesheet_link_tag "base" -%>
<%= javascript_include_tag :defaults, :cache => true -%>
- <% if @atom_auto_discovery -%>
- <%= auto_discovery_link_tag(:atom, :format => :atom) -%>
+ <% if @atom_auto_discovery_url -%>
+ <%= auto_discovery_link_tag(:atom, @atom_auto_discovery_url) -%>
<% end -%>
<%= GitoriousConfig["extra_html_head_data"] -%>
</head> |
