refinerycms-portfolio 0.9.3.6 → 0.9.3.7

data/app/controllers/admin/portfolio_entries_controller.rb

@@ -1,6 +1,7 @@
 class Admin::PortfolioEntriesController < Admin::BaseController
 
   crudify :portfolio_entry, :order => 'position ASC', :conditions => "parent_id IS NULL"
+  before_filter :find_portfolio_entries_for_parents_list, :only => [:new, :create, :edit, :update]
 
   def emancipate
     if (entry = PortfolioEntry.find(params[:id])).present?
@@ -10,4 +11,18 @@ class Admin::PortfolioEntriesController < Admin::BaseController
     redirect_to :action => "index"
   end
 
+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")
+
+    # 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
+  end
+
 end

data/app/models/portfolio_entry.rb

@@ -1,28 +1,32 @@
 class PortfolioEntry < ActiveRecord::Base
-  
+
   validates_presence_of :title
-  
+
   # call to gems included in refinery.
   has_friendly_id :title, :use_slug => true, :strip_diacritics => true
   acts_as_tree :order => "position"
-  
+
   has_and_belongs_to_many :images
 
   def content
     self.body
   end
-  
+
   def content=(value)
     self.body = value
   end
-  
+
 	def image_ids=(ids)
 		self.images.clear
-		
+
 		ids.reject{|id| id.blank? }.each do |image_id|
 			image = Image.find(image_id.to_i) rescue nil
 			self.images << image unless image.nil?
 		end
 	end
-  
+
+	def indented_title
+    "#{"--" * self.ancestors.size} #{self.title}".chomp
+  end
+
 end

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

@@ -26,6 +26,12 @@
     <%= f.label :body, 'Content' %>
     <%= f.text_area :body, :class => "wymeditor", :rows => 7 %>
   </div>
+  <% if @portfolio_entries_for_parents_list.any? %>
+    <div class='field'>
+      <%= f.label :parent_id %>
+      <%= f.collection_select :parent_id, @portfolio_entries_for_parents_list, :id, :indented_title, :include_blank => true %>
+    </div>
+  <% end %>
   <div class='form-actions'>
     <%= f.submit 'Save', :class => "wymupdate" %>
 		or

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.6'
+	plugin.version = '0.9.3.7'
 	plugin.menu_match = /admin\/portfolio(_entries)?/
 	plugin.activity = {
 		:class => PortfolioEntry,

data/readme.md

@@ -23,13 +23,13 @@ Then run:
   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.6", :lib => "portfolio", :source => "http://gemcutter.org"
+  config.gem "refinerycms-portfolio", :version => ">= 0.9.3.7", :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.6", :lib => "portfolio", :source => "http://gemcutter.org"
+  config.gem "refinerycms-portfolio", :version => ">= 0.9.3.7", :lib => "portfolio", :source => "http://gemcutter.org"
 
 Then run in your application's directory:
   rake gems:install

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-portfolio
 version: !ruby/object:Gem::Version 
-  version: 0.9.3.6
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 3
+  - 7
+  version: 0.9.3.7
 platform: ruby
 authors: 
 - Resolve Digital
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +13:00
+date: 2010-02-27 00:00:00 +13:00
 default_executable: refinerycms-portfolio-install
 dependencies: []
 
@@ -61,18 +67,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails portfolio plugin for RefineryCMS.