sunrise-cms 0.5.1 → 0.5.2

data/app/controllers/sunrise/manager_controller.rb

@@ -115,7 +115,7 @@ module Sunrise
         templates << [path, scope, action] if scope
         
         if Sunrise::Config.scoped_views?
-          templates << [path, abstract_model.scoped_path, scope, action]
+          templates << [path, abstract_model.plural, scope, action]
         end
         
         templates.reverse.each do |keys|
@@ -129,8 +129,8 @@ module Sunrise
         templates << [ path, abstract_model.current_list, scope ]
         
         if Sunrise::Config.scoped_views?
-          templates << [ path, abstract_model.scoped_path, scope ]
-          templates << [ path, abstract_model.scoped_path, abstract_model.current_list, scope ]
+          templates << [ path, abstract_model.plural, scope ]
+          templates << [ path, abstract_model.plural, abstract_model.current_list, scope ]
         end
         
         templates.reverse.each do |keys|
@@ -155,7 +155,7 @@ module Sunrise
       
       def redirect_after_update
         if abstract_model.without_list?
-          index_path(:model_name => abstract_model.scoped_path)
+          index_path(:model_name => abstract_model.plural)
         else
           scoped_index_path
         end

data/app/helpers/sunrise/structure_helper.rb

@@ -12,7 +12,7 @@ module Sunrise
     end
 
     def show_model_path(abstract_model, record)
-      model_name = abstract_model.scoped_path
+      model_name = abstract_model.plural
 
       case model_name
       when :some_collection then index_path(:model_name => :stores, :parent_type => :some_collection, :parent_id => record.id)

data/lib/sunrise/abstract_model.rb

@@ -44,7 +44,7 @@ module Sunrise
       end
     end
     
-    attr_accessor :model_name, :current_list, :sort_column, :scoped_path, :available_list_view
+    attr_accessor :model_name, :current_list, :sort_column, :available_list_view
         
     delegate :config, :model, :to => 'self.class'
     delegate :label, :to => 'self.class.config'
@@ -55,7 +55,6 @@ module Sunrise
       @current_list = config.default_list_view
       @available_list_view = config.available_list_view
       @sort_column = config.sort_column
-      @scoped_path = @model_name.plural
       @request_params = params.symbolize_keys
       self.current_list = params[:view]
     end
@@ -190,7 +189,7 @@ module Sunrise
     
     def association_scope
       if parent_record
-        parent_record.send(@scoped_path).scoped
+        parent_record.send(parent_association.relation_name).scoped
       end
     end
     

data/lib/sunrise/config/association.rb

@@ -16,6 +16,10 @@ module Sunrise
       def is_this?(model_type)
         name.to_s.downcase == model_type.to_s.downcase
       end
+
+      def relation_name
+        @relation_name ||= (@config_options[:relation_name] || abstract_model.model.model_name.plural)
+      end
     end
   end
 end

data/lib/sunrise/config/model.rb

@@ -10,7 +10,6 @@ module Sunrise
     class Model < Base
       attr_reader :sections
       
-      
       def initialize(abstract_model, parent = nil, options = nil)
         super
         @sections ||= {}

data/lib/sunrise/version.rb

@@ -1,3 +1,3 @@
 module Sunrise
-  VERSION = "0.5.1".freeze
+  VERSION = "0.5.2".freeze
 end