From 1506fe88cd084ddd77f7dca5708fca5cc37ecf4c Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Mon, 4 Feb 2013 18:34:25 -0800
Subject: [PATCH] fix pool version link

---
 app/controllers/static_controller.rb          | 26 -------------------
 app/models/wiki_page.rb                       |  4 +++
 app/views/pool_versions/index.html.erb        |  2 +-
 app/views/wiki_pages/_recent_changes.html.erb |  2 +-
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index cfb623c05..3379f06b0 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -1,30 +1,4 @@
 class StaticController < ApplicationController
-  def benchmark
-    n = 1_000
-    
-    Benchmark.bm do |x|
-      x.report("default") do
-        n.times do
-          view_context.link_to("test", :controller => "posts", :action => "index", :tags => "abc")
-        end
-      end
-      
-      x.report("posts_path") do
-        n.times do
-          view_context.link_to("test", posts_path(:tags => "abc"))
-        end
-      end
-      
-      x.report("fast link to") do
-        n.times do
-          view_context.fast_link_to("test", :controller => "posts", :action => "index", :tags => "abc")
-        end
-      end
-    end
-    
-    render :nothing => true
-  end
-  
   def terms_of_service
     render :layout => "blank"
   end
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index e59f167ab..3e4662da0 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -43,6 +43,10 @@ class WikiPage < ActiveRecord::Base
       if params[:creator_name]
         q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].downcase)
       end
+      
+      if params[:sort] == "time"
+        q = q.order("updated_at desc")
+      end
 
       q
     end
diff --git a/app/views/pool_versions/index.html.erb b/app/views/pool_versions/index.html.erb
index 59cbf81b1..5d576fbc5 100644
--- a/app/views/pool_versions/index.html.erb
+++ b/app/views/pool_versions/index.html.erb
@@ -18,7 +18,7 @@
         <% @pool_versions.each do |pool_version| %>
           <tr>
             <td><%= pool_version.pool.name %></td>
-            <td><%= link_to pool_version.post_id_array.size, pool_versions_path(pool_version) %></td>
+            <td><%= link_to pool_version.post_id_array.size, pool_version_path(pool_version) %></td>
             <td><%= pool_version_diff(pool_version) %></td>
             <td><%= link_to pool_version.updater.name, user_path(pool_version.updater) %></td>
             <td>
diff --git a/app/views/wiki_pages/_recent_changes.html.erb b/app/views/wiki_pages/_recent_changes.html.erb
index fd60098f9..730d19608 100644
--- a/app/views/wiki_pages/_recent_changes.html.erb
+++ b/app/views/wiki_pages/_recent_changes.html.erb
@@ -1,5 +1,5 @@
 <section>
-  <h1>Recent Changes (<%= link_to "all", wiki_pages_path(:meta_sort => "updated_at.desc") %>)</h1>
+  <h1>Recent Changes (<%= link_to "all", wiki_pages_path(:sort => "time") %>)</h1>
   <ul>
     <% WikiPage.recent.each do |page| %>
       <li class="category-<%= page.category_name %>"><%= link_to page.pretty_title, wiki_page_path(page) %></li>