refinerycms-portfolio 0.9.3.8 → 0.9.5.2

data/app/controllers/admin/portfolio_entries_controller.rb

@@ -15,13 +15,17 @@ protected
 
   # This finds all of the entries that could possibly be assigned as the current entry's parent.
   def find_portfolio_entries_for_parents_list
-    @portfolio_entries_for_parents_list = PortfolioEntry.find(:all, :order => "parent_id, position ASC")
+    if RefinerySetting.find_or_set(:multi_level_portfolio, true)
+      @portfolio_entries_for_parents_list = PortfolioEntry.find(:all, :order => "parent_id, position ASC")
 
-    # We need to remove all references to the current entry or any of its decendants or we get a nightmare.
-    unless @portfolio_entry.nil? or @portfolio_entry.new_record?
-      @portfolio_entries_for_parents_list.reject! do |entry|
-        entry.id == @portfolio_entry.id or @portfolio_entry.descendants.include?(entry)
+      # We need to remove all references to the current entry or any of its decendants or we get a nightmare.
+      unless @portfolio_entry.nil? or @portfolio_entry.new_record?
+        @portfolio_entries_for_parents_list.reject! do |entry|
+          entry.id == @portfolio_entry.id or @portfolio_entry.descendants.include?(entry)
+        end
       end
+    else
+      @portfolio_entries_for_parents_list = []
     end
   end
 

data/app/controllers/portfolio_controller.rb

@@ -14,11 +14,15 @@ class PortfolioController < ApplicationController
 				@master_entry = PortfolioEntry.find_by_parent_id(nil, :order => "position ASC")
 			end
 
-			if params[:portfolio_id]
-				@portfolio_entry = @master_entry.children.find(params[:portfolio_id])
-			else
-				@portfolio_entry = @master_entry.children.first
-			end
+      if RefinerySetting.find_or_set(:multi_level_portfolio, true)
+        if params[:portfolio_id]
+    			@portfolio_entry = @master_entry.children.find(params[:portfolio_id])
+    		else
+    			@portfolio_entry = @master_entry.children.first
+    		end
+    	else
+    	  @portfolio_entry = @master_entry
+  	  end
 
 			begin
 		    if params[:image_id]

data/app/helpers/portfolio_helper.rb

@@ -0,0 +1,17 @@
+module PortfolioHelper
+  
+  def portfolio_image_link(master, portfolio, image_index)
+    if RefinerySetting.find_or_set(:multi_level_portfolio, true)
+      portfolio_image_url(master, portfolio, image_index)
+    else
+      portfolio_image_url(master, image_index)
+    end
+  end
+  
+  def link_to_portfolio_image(master, portfolio, image, index)
+	  link_to	image_fu(image, :portfolio_thumb),
+	      portfolio_image_link(master, portfolio, index), 
+	      :class => ( (index == params[:image_id].to_i) ? "selected" : "pale" )
+  end
+  
+end

data/app/views/admin/portfolio_entries/index.html.erb

@@ -27,4 +27,5 @@
     	</p>
   <% end %>
 </div>
-<%= render :partial => "/shared/admin/make_sortable", :locals => {:tree => true } if PortfolioEntry.count > 1 %>
+<%= render :partial => "/shared/admin/make_sortable", 
+					 :locals => { :tree => RefinerySetting.find_or_set(:multi_level_portfolio, true) } if PortfolioEntry.count > 1 %>

data/app/views/portfolio/show.html.erb

@@ -4,7 +4,7 @@
 	<div id='body_content_left' class='clearfix'>
 		<h1 class='clearfix'>
 		  <span><%= @master_entry.title %></span>
-			<%= select :portfolio_entry, :to_param, @master_entry.children.collect{|entry| [entry.title, entry.to_param] } %>
+			<%= select :portfolio_entry, :to_param, @master_entry.children.collect{|entry| [entry.title, entry.to_param] } if RefinerySetting.find_or_set(:multi_level_portfolio, true) %>
 		</h1>
 
 		<%= render :partial => "main_image" %>
@@ -12,11 +12,9 @@
 	<div id='body_content_right' class='clearfix'>
 		<h2><%= @portfolio_entry.title %></h2>
 		<ul id='portfolio_images'>
-			<% (images = @portfolio_entry.images).each do |image| %>
+			<% @portfolio_entry.images.each_with_index do |image, index| %>
 				<li class='<%= cycle("odd", "even") %>'>
-					<% className = (selected = images.index(image) == params[:image_id].to_i) ? "selected" : "pale" %>
-				  <%= link_to	image_fu(image, :portfolio_thumb),
-				      portfolio_image_url(@master_entry, @portfolio_entry, images.index(image)), :class => className %>
+					<%= link_to_portfolio_image @master_entry, @portfolio_entry, image, index %>
 				</li>
 			<% end %>
 		</ul>
@@ -31,7 +29,7 @@
 			$("ul#portfolio_images li a.pale img").fadeTo(0, 0.3);
 
 			$('#portfolio_entry_to_param').change(function() {
-				window.location = "<%= portfolio_project_url(@master_entry, nil) %>" + this.value;
+				window.location = "<%= RefinerySetting.find_or_set(:multi_level_portfolio, true) ? portfolio_project_url(@master_entry, nil) : portfolio_project_url(@master_entry) %>" + this.value;
 			});
 
       var clicked_on = null;

data/config/routes.rb

@@ -1,7 +1,13 @@
 ActionController::Routing::Routes.draw do |map|
 
-	map.portfolio_project "/portfolio/:id/projects/:portfolio_id", :controller => "portfolio", :action => "show"
-	map.portfolio_image "/portfolio/:id/projects/:portfolio_id/:image_id", :controller => "portfolio", :action => "show"
+  if RefinerySetting.table_exists? and RefinerySetting.find_or_set(:multi_level_portfolio, true)
+	  map.portfolio_project "/portfolio/:id/projects/:portfolio_id", :controller => "portfolio", :action => "show"
+	  map.portfolio_image "/portfolio/:id/projects/:portfolio_id/:image_id", :controller => "portfolio", :action => "show"
+  else
+    map.portfolio_project "/portfolio/:id", :controller => "portfolio", :action => "show"
+    map.portfolio_image "/portfolio/:id/:image_id", :controller => "portfolio", :action => "show"
+  end
+
   map.portfolio "/portfolio/:id/", :controller => 'portfolio', :action => 'show'
 
   map.resources :portfolio do |portfolio|

data/db/migrate/20090917224823_create_portfolio_structure.rb

@@ -16,32 +16,33 @@ class CreatePortfolioStructure < ActiveRecord::Migration
 	    t.datetime :created_at
 	    t.datetime :updated_at
 	  end
-	
+
 		User.find(:all).each do |user|
 			user.plugins.create(:title => "Portfolio", :position => (user.plugins.maximum(:position) || -1) +1)
 		end
-		
+
 		page = Page.create(:title => "Portfolio", :link_url => "/portfolio", :deletable => false, :position => ((Page.maximum(:position, :conditions => "parent_id IS NULL") || -1)+1))
 		RefinerySetting.find_or_set(:default_page_parts, ["body", "side_body"]).each do |default_page_part|
 			page.parts.create(:title => default_page_part, :body => nil)
 		end
-		
+
+    # we need to retrieve the value, merge it in and then save it back because it's a frozen hash.
 		image_thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})
 		RefinerySetting[:image_thumbnails] = image_thumbnails.merge({:portfolio_thumb => 'c96x96', :portfolio => '600x512'})
   end
 
   def self.down
 		UserPlugin.destroy_all({:title => "Portfolio"})
-		
+
 		Page.find_all_by_link_url("/portfolio").each do |page|
 			page.link_url, page.menu_match, page.deletable = nil
 			page.destroy
 		end
 		Page.destroy_all({:link_url => "/portfolio"})
-	
+
 		image_thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})
 		RefinerySetting[:image_thumbnails] = image_thumbnails.delete_if {|key, value| key == :portfolio_thumb or key == :portfolio }
-	
+
 		drop_table :images_portfolio_entries
 		drop_table :portfolio_entries
   end

data/rails/init.rb

@@ -3,7 +3,7 @@ Refinery::Plugin.register do |plugin|
 	plugin.title = "Portfolio"
 	plugin.description = "Manage a portfolio"
 	plugin.url = "/admin/#{plugin.title.downcase}"
-	plugin.version = '0.9.3.8'
+	plugin.version = '0.9.5.2'
 	plugin.menu_match = /admin\/portfolio(_entries)?/
 	plugin.activity = {
 		:class => PortfolioEntry,

data/readme.md

@@ -6,10 +6,12 @@ By: [Resolve Digital](http://www.resolvedigital.com)
 ## Plugin Installation
 
 Just 'git clone' Refinery, install this as a plugin using:
-  script/plugin install git://github.com/resolve/refinerycms-portfolio.git
+
+    script/plugin install git://github.com/resolve/refinerycms-portfolio.git
 
 Then run:
-  rake refinery:portfolio:install
+
+    rake refinery:portfolio:install
 
 ..and follow the instructions!
 
@@ -17,24 +19,34 @@ Then run:
 
 ### Method One
 Just install the gem 'portfolio' with the command:
-  gem install refinerycms-portfolio --source http://gemcutter.org
+
+    gem install refinerycms-portfolio --source http://gemcutter.org
 
 Then run:
-  refinerycms-portfolio-install /path/to/your/refinery/application
+
+    refinerycms-portfolio-install /path/to/your/refinery/application
 
 Then place in your config/environment.rb (or config/application.rb for refinery 0.9.6.x) file before all other Refinery gem calls:
-  config.gem "refinerycms-portfolio", :version => ">= 0.9.3.8", :lib => "portfolio", :source => "http://gemcutter.org"
+
+    config.gem "refinerycms-portfolio", :version => ">= 0.9.5.2", :lib => "portfolio", :source => "http://gemcutter.org"
 
 ..and follow the instructions!
 
 ### Method Two
 Place in your config/environment.rb (or config/application.rb for refinery 0.9.6.x) file before all other Refinery gem calls:
-  config.gem "refinerycms-portfolio", :version => ">= 0.9.3.8", :lib => "portfolio", :source => "http://gemcutter.org"
+
+    config.gem "refinerycms-portfolio", :version => ">= 0.9.5.2", :lib => "portfolio", :source => "http://gemcutter.org"
 
 Then run in your application's directory:
-  rake gems:install
+
+    rake gems:install
 
 Then run:
-  refinerycms-portfolio-install /path/to/your/refinery/application
 
-..and follow the instructions!
+    refinerycms-portfolio-install /path/to/your/refinery/application
+
+..and follow the instructions!
+
+## Single or Multiple Level Portfolios
+
+The standard setup for portfolios is multi-level, with a parent portfolio having child portfolios.  If your needs are simpler, you can switch to a single level of portfolios by changing the Refinery Setting for 'Multi Level Portfolio' to false.

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  - 8
-  version: 0.9.3.8
+  - 5
+  - 2
+  version: 0.9.5.2
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 +13:00
+date: 2010-04-13 00:00:00 +12:00
 default_executable: refinerycms-portfolio-install
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - readme.md
 - app/controllers/admin/portfolio_entries_controller.rb
 - app/controllers/portfolio_controller.rb
+- app/helpers/portfolio_helper.rb
 - app/models/portfolio_entry.rb
 - app/views/admin/portfolio_entries/_form.html.erb
 - app/views/admin/portfolio_entries/_list.html.erb