From 34ad7336d68873ca62cb6b4ef5f473e1d893b785 Mon Sep 17 00:00:00 2001
From: Jason LaPier <jason.lapier@gmail.com>
Date: Wed, 23 Nov 2011 16:03:15 -0800
Subject: [PATCH] allow category show page to redirect to a ContentPage

---
 app/controllers/categories_controller.rb      |  8 +++----
 app/models/category.rb                        |  2 ++
 app/views/categories/_list.html.erb           |  2 +-
 app/views/categories/edit.html.erb            |  4 ++++
 app/views/categories/show.html.erb            | 21 +++++++++++++++++++
 ...direct_to_content_page_id_to_categories.rb |  9 ++++++++
 public/stylesheets/application.css            |  1 +
 7 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20111123232639_add_redirect_to_content_page_id_to_categories.rb

diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 4790ebc..279e8d6 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -18,10 +18,8 @@ def index
   # GET /categories/1.xml
   def show
     @category = Category.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.xml  { render :xml => @category }
+    if @category.redirect_to_content_page and params[:no_redirect].blank?
+      redirect_to @category.redirect_to_content_page
     end
   end
 
@@ -55,7 +53,7 @@ def update
     respond_to do |format|
       if @category.update_attributes(params[:category])
         flash[:notice] = 'Category was successfully updated.'
-        format.html { redirect_to(@category) }
+        format.html { redirect_to(category_path(@category, :no_redirect => 1)) }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
diff --git a/app/models/category.rb b/app/models/category.rb
index bf70ac9..7f79723 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -3,6 +3,8 @@ class Category < ActiveRecord::Base
   has_many :blog_posts, :class_name => 'Blog::Post'
   belongs_to :parent, :class_name => 'Category'
   has_many :children, :class_name => 'Category', :foreign_key => 'parent_id'
+  belongs_to :redirect_to_content_page, :class_name => 'ContentPage', 
+    :foreign_key => 'redirect_to_content_page_id'
   validates_presence_of :name
   validates_uniqueness_of :name
   searchable_by :name
diff --git a/app/views/categories/_list.html.erb b/app/views/categories/_list.html.erb
index 435f0c9..2ef9f5d 100644
--- a/app/views/categories/_list.html.erb
+++ b/app/views/categories/_list.html.erb
@@ -2,7 +2,7 @@
   <% categories.each do |category| -%>
     <li id="cat_<%= category.id %>">
       <div class="category_name"><%= category.name %></div>
-      <div class="category_pages"><%= link_to pluralize(category.content_pages.count, 'page'), category %></div>
+      <div class="category_pages"><%= link_to pluralize(category.content_pages.count, 'page'), category_path(category, :no_redirect => 1) %></div>
       <div class="category_edit"><%= link_to 'edit', edit_category_path(category) %></div>
       <div class="category_del"><%= link_to 'delete', category_path(category), :method => :delete %></div>
       <% child_cats = @categories.select { |cat| category.id == cat.parent_id } %>
diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb
index 611288c..0368271 100644
--- a/app/views/categories/edit.html.erb
+++ b/app/views/categories/edit.html.erb
@@ -5,6 +5,10 @@
   <p>
     Category: <%= f.text_field :name %><br/>
     Parent: <%= f.select :parent_id, @categories.map {|c| [c.name, c.id]}, :include_blank => true %><br/>
+    <em>instead of showing a boring table when you land on this category page, you can redirect to an actual content page</em><br/>
+    Redirect to: <%= f.select :redirect_to_content_page_id, 
+      ContentPage.order("name").map {|cp| [cp.name, cp.id]},
+      :include_blank => true %><br/>
     <%= f.submit 'save category' %>
   </p>
 <% end %>
diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb
index 1fd1f06..1e8bd9a 100644
--- a/app/views/categories/show.html.erb
+++ b/app/views/categories/show.html.erb
@@ -39,7 +39,28 @@
 <%= render :partial => 'blog/posts/lead_in', :collection => @category.blog_posts,
            :as => :post %>
 <% end %>
+
+
+
 <% if is_admin? %>
+  <% if @category.redirect_to_content_page %>
+    <p>
+      <em>Note:</em> This category page redirects to:
+      <%= link_to @category.redirect_to_content_page.name,
+            @category.redirect_to_content_page %>
+    </p>
+  <% else %>
+    <p><em>Want this page to redirect to a real page?</em></p>
+  <% end %>
+  <%= form_for(@category) do |f| %>
+    <p>
+      Redirect to: <%= f.select :redirect_to_content_page_id, 
+        ContentPage.order("name").map {|cp| [cp.name, cp.id]},
+        :include_blank => true %>
+      <%= f.submit 'set' %>
+    </p>
+  <% end %>
+
   <p class="admin_links">
     <span class="fake_button">
     <%= link_to 'List of Categories', categories_path %> |
diff --git a/db/migrate/20111123232639_add_redirect_to_content_page_id_to_categories.rb b/db/migrate/20111123232639_add_redirect_to_content_page_id_to_categories.rb
new file mode 100644
index 0000000..e425df7
--- /dev/null
+++ b/db/migrate/20111123232639_add_redirect_to_content_page_id_to_categories.rb
@@ -0,0 +1,9 @@
+class AddRedirectToContentPageIdToCategories < ActiveRecord::Migration
+  def self.up
+    add_column :categories, :redirect_to_content_page_id, :integer
+  end
+
+  def self.down
+    remove_column :categories, :redirect_to_content_page_id
+  end
+end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5714122..a01fa2a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -302,6 +302,7 @@ ul.events .open:before { content: '- ' }
 
 ul.category_list { 
   list-style-type: none;
+  margin-left: 20px;
 }
 
 ul.category_list li { }