Changeset 1701

Timestamp:

05/11/08 12:10:49 (5 days ago)

Author:

neuro

Message:

This should apparently solve every redirect issue left so far

Files:

• trunk/app/controllers/articles_controller.rb (modified) (1 diff)
• trunk/app/controllers/redirect_controller.rb (modified) (1 diff)
• trunk/app/helpers/content_helper.rb (modified) (1 diff)
• trunk/app/views/articles/groupings.html.erb (modified) (1 diff)
• trunk/config/routes.rb (modified) (2 diffs)

trunk/app/controllers/articles_controller.rb

@@ -97 +97 @@
-  end
-
-  def strip_article
-      redirect_to request.request_uri.gsub('articles/', ''), :status => 301
-  end
-
-  private
-

trunk/app/controllers/redirect_controller.rb

@@ -3 +3 @@
-
-  def redirect
+    
+    puts "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+    
+    # Ugly way to manage redirects, anything better ?
+    if (request.request_uri =~ /^\/articles/)
+      
+      puts "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
+      
+      redirect_to request.request_uri.gsub('/articles', ''), :status => 301
+      return
+    end
+
-    r = Redirect.find_by_from_path(params[:from])
-

trunk/app/helpers/content_helper.rb

@@ -6 +6 @@
-           min_class.to_s :
-         (min_class + ((max_class-min_class) * articles.to_f / max_articles).to_i).to_s)
-  end
-
-  def link_to_grouping(grp)
-    link_to( grp.display_name, urlspec_for_grouping(grp),
-             :rel => "tag", :title => title_for_grouping(grp) )
-  end
-
-  def urlspec_for_grouping(grouping)
-    { :controller => "/articles", :action => grouping.class.to_prefix, :id => grouping.permalink }
-  end
-

trunk/app/views/articles/groupings.html.erb

@@ -5 +5 @@
-<% for grp in @groupings.sort_by{|grp|grp.display_name} -%>
-  <li class="<%= calc_distributed_class(grp.article_counter, max_counter, @grouping_class, 0, 10) %>">
-grouping(grp
+permalink(grp, grp.display_name
-  </li>
-<% end -%>

trunk/config/routes.rb

@@ -87 +87 @@
-  end
-
+  # Redirects from old permalinks
+  map.connect "articles/:controler/:name",
+    :controller => 'redirect', :action => 'redirect'
+    map.connect "articles/:controler",
+      :controller => 'redirect', :action => 'redirect'
+
-  map.inflected_resource(:categories, :path_prefix => '')
-  map.inflected_resource(:authors, :path_prefix => '')
@@ -102 +108 @@
-    get.with_options(date_options.merge(:controller => 'articles')) do |dated|
-      dated.with_options(:action => 'index') do |finder|
-        # old URL
-        finder.connect 'articles/:year/page/:page',
-          :controller => 'articles', :action => 'strip_article'
-        finder.connect 'articles/:year/:month/page/:page',
-          :controller => 'articles', :action => 'strip_article'
-        finder.connect 'articles/:year/:month/:day/page/:page', 
-          :controller => 'articles', :action => 'strip_article'
-        finder.connect 'articles/:year',
-          :controller => 'articles', :action => 'strip_article'
-        finder.connect 'articles/:year/:month',
-          :controller => 'articles', :action => 'strip_article'
-        finder.connect 'articles/:year/:month/:day',
-          :controller => 'articles', :action => 'strip_article'
-        finder.connect 'articles/:year/:month/:day/:id',
-          :controller => 'articles', :action => 'strip_article'
-
-        # new URL
-        finder.connect ':year/page/:page',