releaf 0.1.1 → 0.1.2

data/app/controllers/releaf/content_controller.rb

@@ -1,14 +1,20 @@
 module Releaf
   class ContentController < BaseController
+    helper_method :content_fields_to_display
 
-    def columns( view = nil )
-      if view == 'show'
-        return %w[name parent_id visible protected content]
+    def content_fields_to_display obj_class
+      if obj_class.respond_to? :releaf_fields_to_display
+        obj_class.releaf_fields_to_display params[:action]
       else
-        return super
+        obj_class.column_names - %w[id created_at updated_at position]
       end
     end
 
+    def fields_to_display
+      return super unless params[:action] == 'show'
+      return %w[name parent_id visible protected content]
+    end
+
     def build_secondary_panel_variables
       @nodes = Node.roots
       super
@@ -24,12 +30,11 @@ module Releaf
     def create
       content_type = _node_params[:content_type].constantize
       authorize! :create, content_type
-      @item = current_object_class.new(_node_params)
-      @item.assign_attributes(_node_common_fields_params)
+      @resource = resource_class.new(_node_params)
 
       respond_to do |format|
-        if @item.save
-          format.html { redirect_to url_for(:action => "index", :controller => 'content')}
+        if @resource.save
+          format.html { redirect_to url_for(:action => "edit", :controller => 'content', :id => @resource.id)}
         else
           form_extras
           @order_nodes = Node.where(:parent_id => (params[:parent_id] ? params[:parent_id] : nil))
@@ -39,40 +44,39 @@ module Releaf
     end
 
     def generate_url
-      tmp_item = nil
+      tmp_resource = nil
 
       if params[:id]
-        tmp_item = Node.find(params[:id])
+        tmp_resource = Node.find(params[:id])
       elsif params[:parent_id].blank? == false
         parent = Node.find(params[:parent_id])
-        tmp_item = parent.children.new
+        tmp_resource = parent.children.new
       else
-        tmp_item = Node.new
+        tmp_resource = Node.new
       end
 
-      tmp_item.name = params[:name]
-      tmp_item.slug = nil
+      tmp_resource.name = params[:name]
+      tmp_resource.slug = nil
       # FIXME calling private method
-      tmp_item.send(:ensure_unique_url)
+      tmp_resource.send(:ensure_unique_url)
 
       respond_to do |format|
-        format.js { render :text => tmp_item.slug }
+        format.js { render :text => tmp_resource.slug }
       end
     end
 
     def update
-      @item = current_object_class.find(params[:id])
-      authorize! :edit, @item
+      @resource = resource_class.find(params[:id])
+      authorize! :edit, @resource
 
       form_extras
-      @order_nodes = Node.where(:parent_id => (@item.parent_id ? @item.parent_id : nil)).where('id != :id', :id => params[:id])
+      @order_nodes = Node.where(:parent_id => (@resource.parent_id ? @resource.parent_id : nil)).where('id != :id', :id => params[:id])
 
-      @item.assign_attributes(_node_params)
-      @item.assign_attributes(_node_common_fields_params)
+      @resource.assign_attributes(_node_params)
 
 
       respond_to do |format|
-        if @item.save
+        if @resource.save
           format.html { redirect_to url_for(:action => "edit") }
         else
           format.html { render action: "edit" }
@@ -81,12 +85,12 @@ module Releaf
     end
 
     def new
-      authorize! :create, current_object_class
+      authorize! :create, resource_class
       unless params[:ajax] == '1'
         super
         @order_nodes = Node.where(:parent_id => (params[:parent_id] ? params[:parent_id] : nil))
         @position = 1
-        @item.parent_id = params[:parent_id]
+        @resource.parent_id = params[:parent_id]
         form_extras
       else
         Rails.application.eager_load!
@@ -97,10 +101,10 @@ module Releaf
 
     def edit
       super
-      @order_nodes = Node.where(:parent_id => (@item.parent_id ? @item.parent_id : nil)).where('id != :id', :id => params[:id])
+      @order_nodes = Node.where(:parent_id => (@resource.parent_id ? @resource.parent_id : nil)).where('id != :id', :id => params[:id])
 
-      if @item.higher_item
-        @position = @item.higher_item.position
+      if @resource.higher_item
+        @position = @resource.position
       else
         @position = 1
       end
@@ -108,13 +112,18 @@ module Releaf
       form_extras
     end
 
+    def setup
+      super
+      @features[:show] = false
+    end
+
     def get_content_form
       Rails.application.eager_load!
-      raise ArgumentError unless NodeBase.node_classes.map { |nc| nc.name }.include? params[:content_type]
-      @node = current_object_class.find(params[:id])
-      authorize! :edit, @item
+      raise ArgumentError unless content_type_class_names.include? params[:content_type]
+      @node = resource_class.find(params[:id])
+      authorize! :edit, @resource
 
-      @item = params[:content_type].constantize.new
+      @resource = params[:content_type].constantize.new
 
       respond_to do |format|
         format.html { render :partial => 'get_content_form', :layout => false }
@@ -122,25 +131,26 @@ module Releaf
 
     end
 
-
-    def current_object_class
+    def resource_class
       Node
     end
 
     protected
 
-    def _node_common_fields_params
-      allowed_params = (@item.common_field_names).map { |f| f.sub(/_uid$/, '') }
-      params.require(current_object_class_name).permit(*allowed_params)
-    end
-
     def _node_params
-      allowed_params = (%w[parent_id name content_type slug position data visible protected content_object_attributes]).map { |f| f.sub(/_uid$/, '') }
-      params.require(current_object_class_name).permit(*allowed_params)
+      params.require(:resource).permit!
     end
 
     private
 
+    def content_type_class_names
+      content_type_classes.map { |nc| nc.name }.sort
+    end
+
+    def content_type_classes
+      NodeBase.node_classes + BlankNodeBase.node_classes
+    end
+
     def form_extras
       Rails.application.eager_load!
       get_base_models
@@ -148,18 +158,25 @@ module Releaf
       new_content_if_needed
     end
 
-    def node_params(action)
-      # make sure none of actions, that are defined by BaseController can update item
+    def resource_params
       []
     end
 
     def new_content_if_needed
-      return if @item.content
-      @item.content = @item.content_type.constantize.new if get_base_models.map { |bm| bm.name }.include? @item.content_type
+      return if @resource.content
+      if params[:content_type]
+        if get_base_models.map { |bm| bm.name }.include? params[:content_type]
+          @resource.content_type = params[:content_type]
+          content_class = @resource.content_type.constantize
+          if content_class.node_type == 'Releaf::NodeBase'
+            @resource.content = @resource.content_type.constantize.new
+          end
+        end
+      end
     end
 
     def get_base_models
-      @base_models ||= NodeBase.node_classes
+      @base_models ||= content_type_classes
     end
 
   end

data/app/controllers/releaf/roles_controller.rb

@@ -1,25 +1,27 @@
 module Releaf
   class RolesController < BaseController
 
-    def current_object_class
+    def resource_class
       Releaf::Role
     end
 
-    def columns( view = nil )
-      fields = (super(view) - ['default']).insert(1, 'default')
-      if view == 'index'
-        fields - ['permissions'] + ['admin_permission']
+    def fields_to_display
+      case params[:action].to_sym
+      when :index
+        %w[name default_controller default]
+      when :create, :edit, :new, :update, :show
+        %w[name default default_controller permissions]
       else
-        fields
+        []
       end
     end
 
     protected
 
-    def role_params( action )
-      return [] unless [:update, :create].include? action
+    def resource_params
+      return [] unless %w[update create].include? params[:action]
 
-      fields = ['name', 'default']
+      fields = ['name', 'default', 'default_controller']
       AdminAbility::PERMISSIONS.each do |permission|
         if permission.is_a? String
           fields.push "#{permission}_permission"

data/app/controllers/releaf/sessions_controller.rb

@@ -1,5 +1,27 @@
 module Releaf
   class SessionsController < Devise::SessionsController
-    layout "releaf/admin"
+    layout "releaf/devise"
+
+    def after_sign_in_path_for(resource)
+      controller_name = resource.role.default_controller
+
+      if controller_name
+        if controller_name == 'content'
+          default_path = releaf_nodes_path
+        elsif controller_name == 'translations'
+          default_path = releaf_translation_groups_path
+        else
+          default_path = send("admin_#{controller_name}_path")
+        end
+      else
+        default_path = releaf_nodes_path
+      end
+
+      return default_path
+    end
+
+    def full_controller_name
+      self.class.name.sub(/Controller$/, '').underscore
+    end
   end
 end

data/app/controllers/releaf/translations_controller.rb

@@ -1,14 +1,7 @@
 module Releaf
   class TranslationsController < BaseController
 
-    def setup
-      super
-      @object_class = I18n::Backend::Releaf::TranslationGroup
-      @features[:show] = false
-      @continuous_scroll = true
-    end
-
-    def current_object_class
+    def resource_class
       @object_class
     end
 
@@ -23,7 +16,7 @@ module Releaf
 
     def index
       authorize! :manage, I18n::Backend::Releaf::Translation
-      @list = @object_class = I18n::Backend::Releaf::Translation.includes(:translation_data).filter(:search => params[:search])
+      @resources = @object_class = I18n::Backend::Releaf::Translation.includes(:translation_data).filter(:search => params[:search])
       if !params[:ajax].blank?
         render :layout => false
       end
@@ -31,23 +24,18 @@ module Releaf
 
     def edit
       authorize! :manage, I18n::Backend::Releaf::Translation
-      @item = current_object_class.find(params[:id])
-    end
-
-    def show
-      authorize! :manage, I18n::Backend::Releaf::Translation
-      redirect_to url_for( :action => "edit", :id => params[:id] )
+      @resource = resource_class.find(params[:id])
     end
 
     def create
       authorize! :manage, I18n::Backend::Releaf::Translation
-      @item = current_object_class.new(item_params)
+      @resource = resource_class.new(resource_params)
 
       respond_to do |format|
-        if @item.save
+        if @resource.save
           update_translations
           Settings.i18n_updated_at = Time.now
-          format.html { redirect_to url_for(:action => "edit", :id => @item.id) }
+          format.html { redirect_to url_for(:action => "edit", :id => @resource.id) }
         else
           format.html { render :action => "new" }
         end
@@ -56,22 +44,30 @@ module Releaf
 
     def update
       authorize! :manage, I18n::Backend::Releaf::Translation
-      @item = current_object_class.find(params[:id])
+      @resource = resource_class.find(params[:id])
 
       unless params[:translations].blank?
         ids_to_keep = update_translations
-        @item.translations.where('id NOT IN (?)', ids_to_keep).destroy_all
+        @resource.translations.where('id NOT IN (?)', ids_to_keep).destroy_all
       else
-        @item.translations.destroy_all
+        @resource.translations.destroy_all
       end
       Settings.i18n_updated_at = Time.now
 
 
       respond_to do |format|
-        format.html { redirect_to url_for(:action => "edit", :id => @item.id) }
+        format.html { redirect_to url_for(:action => "edit", :id => @resource.id) }
       end
     end
 
+    protected
+
+    def setup
+      super
+      @object_class = I18n::Backend::Releaf::TranslationGroup
+      @features[:show] = false
+      @continuous_scroll = true
+    end
 
     private
 
@@ -86,7 +82,7 @@ module Releaf
         if id =~ /\A\d+\z/
           translation = I18n::Backend::Releaf::Translation.find(id)
         else
-          translation = @item.translations.new
+          translation = @resource.translations.new
         end
 
         translation.key = params[:translation_group][:scope] + '.' + t['key']
@@ -113,8 +109,8 @@ module Releaf
       return ids_to_keep
     end
 
-    def item_params
-      params.require(current_object_class_name).permit(:scope)
+    def resource_params
+      params.require(:resource).permit(:scope)
     end
 
   end

data/app/helpers/releaf/admin_helper.rb

@@ -1,26 +1,6 @@
 module Releaf
   module AdminHelper
 
-    def polymorphic_association_names obj
-      poly_asoc = obj.class.reflect_on_all_associations.map { |r| r.options[:polymorphic] ? r.name : nil }
-      poly_asoc.delete(nil)
-      poly_asoc.map { |pa| pa.to_s }
-    end
-
-    def has_many_association_names obj
-      reflect_all_asoc = obj.reflect_on_all_associations(:has_many)
-      has_many_asoc_names = reflect_all_asoc.map { |asoc| asoc.name }
-
-      reflect_all_asoc.each do |asoc|
-        next unless asoc.options.has_key?(:through)
-        has_many_asoc_names.delete(asoc.name)
-      end
-
-      # don't show translations associaton which is created by globalize3
-      has_many_asoc_names - [:translations]
-    end
-
-
     def is_this_main_menu_item_active? releaf_main_menu_item
       _check_if_this_is_valid_releaf_main_menu_item releaf_main_menu_item
 

data/app/models/releaf/admin.rb

@@ -14,6 +14,15 @@ module Releaf
 
     image_accessor :avatar
 
+    attr_accessible \
+      :avater,
+      :name,
+      :surname,
+      :role_id,
+      :email,
+      :password,
+      :password_confirmation
+
     scope :filter, lambda {|params|
         fields = []
         values = {}

data/app/models/releaf/blank_node_base.rb

@@ -0,0 +1,29 @@
+module Releaf
+  class BlankNodeBase
+    # returns only bottom level, not /^Releaf::/ subclasses
+    def self.node_classes
+      return _node_classes(self).reject { |n| n.name =~ /^Releaf::/ }
+    end
+
+    def self.releaf_fields_to_display action
+      []
+    end
+
+    def self.node_type
+      "Releaf::BlankNodeBase"
+    end
+
+    private
+
+    def self._node_classes(klass)
+      classes = [klass]
+
+      klass.subclasses.each do |sublcass|
+        classes += _node_classes(sublcass)
+      end
+
+      return classes
+    end
+
+  end
+end