radiant-relations-extension 1.0.0 → 1.1.0

data/app/helpers/relations_helper.rb

@@ -3,14 +3,24 @@ module RelationsHelper
     options = []
     options << [t('support.select.prompt'), nil]
     if @page && @page.field('relations_target_parent_id')
-      Page.find(@page.field('relations_target_parent_id').content).children.each do |p| 
-        options << [p.title, p.id]
-      end
+      options.concat build_tree(Page.find(@page.field('relations_target_parent_id').content), [])
     else
-      Page.all.each do |p| 
-        options << [p.title, p.id]
-      end
+      options.concat build_tree(Page.root, [])
     end
     options_for_select(options, selected)
   end
+  
+  def build_tree(page, list, level = 0)
+    label = "#{'-'*level} #{page.title}"
+    id = page.id
+    list << [label, id]
+
+    return list if page.fields.select{|f| f.name == "exclude_children_from_relations_target"}.any?
+    return list if Radiant::Config["relations.exclude_archive_children"] && page.class_name =~ /ArchivePage/
+
+    page.children.each do |p|
+      build_tree p, list, level + 1
+    end
+    list
+  end
 end

data/config/locales/nl.yml

@@ -4,3 +4,6 @@ nl:
     page_parts:
       relation_page_part:
         add_row: Relatie toevoegen
+  support:
+    select:
+      prompt: Maak een keuze

data/lib/radiant-relations-extension.rb

@@ -1,3 +1,3 @@
 class RadiantRelationsExtension
-  VERSION = '1.0.0'
-end
+  VERSION = '1.1.0'
+end

data/radiant-relations-extension.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |s|
   s.version     = RadiantRelationsExtension::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jan De Poorter", "Benny Degezelle"]
-  s.email       = ["jan@defv.be"]
-  s.homepage    = "http://github.com/defv/radiant-relations-extension"
-  s.summary     = %q{Relations for Radiant CMS}
-  s.description = %q{Makes Radiant better by adding relations!}
+  s.email       = ["rubygems@monkeypatch.be"]
+  s.homepage    = "http://github.com/jomz/radiant-relations-extension"
+  s.summary     = %q{Relations extension for Radiant CMS}
+  s.description = %q{Allows you to define relations between pages}
   
   ignores = if File.exist?('.gitignore')
     File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.post_install_message = %{
-  Add this to your radiant project with:
-    config.gem 'radiant-relations-extension', :version => '~>#{RadiantRelationsExtension::VERSION}'
+    Add this to your radiant project by putting this line in your Gemfile:
+      gem "radiant-children_config-extension", "~> #{RadiantRelationsExtension::VERSION}"
   }
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-relations-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jan De Poorter
@@ -16,13 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 +02:00
+date: 2012-09-25 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: Makes Radiant better by adding relations!
+description: Allows you to define relations between pages
 email: 
-- jan@defv.be
+- rubygems@monkeypatch.be
 executables: []
 
 extensions: []
@@ -48,7 +48,6 @@ files:
 - lib/tasks/relations_extension_tasks.rake
 - public/javascripts/admin/relations.js
 - public/stylesheets/sass/admin/relations.sass
-- radiant-relations-extension-1.0.0.gem
 - radiant-relations-extension.gemspec
 - Rakefile
 - README
@@ -56,10 +55,10 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/defv/radiant-relations-extension
+homepage: http://github.com/jomz/radiant-relations-extension
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-relations-extension', :version => '~>1.0.0'\n  "
+post_install_message: "\n    Add this to your radiant project by putting this line in your Gemfile:\n      gem \"radiant-children_config-extension\", \"~> 1.1.0\"\n  "
 rdoc_options: []
 
 require_paths: 
@@ -85,10 +84,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
-summary: Relations for Radiant CMS
+summary: Relations extension for Radiant CMS
 test_files: 
 - spec/spec.opts
 - spec/spec_helper.rb