adminpanel 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eadbce977126b17e453644c2508dd1e3377eb523
-  data.tar.gz: 27354bf7c01b4a93fde0f398aa4e167053df40a9
+  metadata.gz: d9ebfa9303054c3167f2244f4343c26290c717c4
+  data.tar.gz: c9c795f7c6c8123c88ed3629bba3194ccdaa1c9d
 SHA512:
-  metadata.gz: de75f1481eec50952eb50709d74141824c03af98f3ecf7b2b9f56da5f5292b3dbb5883536fdc26c792f873aeda6e31ad403b374ca185a394261c80b294062422
-  data.tar.gz: 70889f9232f36f64f01e07f13dbaa79f88f96114ff24206ef2df9fe755efbb507c1b4c270c661b7a1feafc8f7562de9c14db6f06ffc2aa4dbf4d9c577f98bb25
+  metadata.gz: 2acee553facf3aeb288c3ac7cb47b7642f31e0cb64de12ac7f2ee341b65eff32cecfdeafd36e536d987c1c8268a602408aebd126dfe83fa36f7ac06c4df7e7c8
+  data.tar.gz: 7d2e33fd92205c7df96067e0fa663c8f5df8eb2f44106b11cc58078a86726137f142d075927b605cece97616411c6bada682ae87c2d896962e85ed738689e2ea

data/README.md

@@ -16,29 +16,33 @@ And then execute:
 
     $ bundle
 
-In you application.rb
-
-    config.i18n.default_locale = :es # or :en
-
-no other language is currently supported, but pull requests are welcome.
-
-Then run:
+Run:
 
     rails g adminpanel:initialize
     rake db:migrate
-to create the database that the adminpanel it's expecting, this will also seed the database with the default user if you're in development environment (email: 'admin@admin.com', password: 'password').
+This create and seeds a user to the database (email: 'admin@admin.com', password: 'password').
 
-Then, mount the gem wherever you like!
+And mount the gem wherever you like!
 
     mount Adminpanel::Engine => '/panel'
+    
+#### Optional
 
-## Usage
+In you application.rb
 
-Make sure you [read the wiki](https://github.com/codn/adminpanel/wiki), there is the descriptions of every relevant part of the gem.
+    config.i18n.default_locale = :es # or :en
 
-To create a new resource check the [Resource Generator.](https://github.com/codn/adminpanel/wiki/Generator-adminpanel:resource)
+no other language is currently supported, but pull requests are welcome.
 
-You can seed the sections with help of the [Section task.](https://github.com/codn/adminpanel/wiki/Rake-task-adminpanel:section)
+## Usage
+
+To create a new resource: 
+```
+rails g adminpanel:resource product name price:float description:wysiwyg
+```
+check the [Resource Generator wiki.](https://github.com/codn/adminpanel/wiki/Generator-adminpanel:resource) for more information.
+
+Make sure you [read the wiki](https://github.com/codn/adminpanel/wiki), there is the descriptions of every relevant part of the gem.
 
 ## Dependencies
 

data/adminpanel.gemspec

@@ -27,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mini_magick', '4.1.0'
   spec.add_runtime_dependency 'bcrypt',      '~> 3.1',   '>= 3.1.7'
   spec.add_runtime_dependency 'carrierwave', '~> 0.10',  '>= 0.10.0'
-  spec.add_runtime_dependency 'cancancan',   '~> 1.10.1', '>= 1.10.1'
+  spec.add_runtime_dependency 'cancancan',   '~> 1.10.1','>= 1.10.1'
+  spec.add_runtime_dependency 'friendly_id', '~> 5.1.0',   '>= 5.1.0'
 
   # Implemented APIs
   spec.add_runtime_dependency 'google-api-client', '0.8.2'  # Google analytics

data/app/controllers/concerns/adminpanel/rest_actions.rb

@@ -7,21 +7,25 @@ module Adminpanel
                                               :edit,
                                               :update,
                                               :destroy,
+                                              :move_to_position,
                                               :fb_choose_page,
                                               :fb_save_token,
                                               :fb_publish,
                                               :twitter_publish
                                             ]
-      before_action :set_resource_collection,      only: [:index, :destroy]
-      before_action :set_relationship_collections, only: [:new, :create, :edit, :update]
+      before_action :set_resource_collection, only: [:index, :destroy]
     end
 
     def index
-      render 'adminpanel/templates/index' if stale?(etag: @collection, public: true, template: false)
+      if stale?(etag: @collection, public: true, template: false)
+        render 'adminpanel/templates/index'
+      end
     end
 
     def show
-      render 'adminpanel/templates/show' if stale?(etag: @resource_instance, public: true, template: false)
+      if stale?(etag: @resource_instance, public: true, template: false)
+        render 'adminpanel/templates/show'
+      end
     end
 
     def new
@@ -41,10 +45,10 @@ module Adminpanel
             # if format js, request is from another controller's form
             if params[:belongs_request]
               # we are in other controller as a belongs_to, add option to select
-              render 'adminpanel/templates/create_belongs_to', locals: { resource: @resource_instance }
+              render 'adminpanel/templates/option_for_select'
             else
               # we are in other controller as a has_many, add checkbox
-              render 'adminpanel/templates/create_has_many', locals: { resource: @resource_instance }
+              render 'adminpanel/templates/checkbox'
             end
           end
         else
@@ -73,32 +77,15 @@ module Adminpanel
 
     private
 
-    def set_relationship_collections
-      @collections = {}
-      set_belongs_to_collections
-      set_has_many_collections
-    end
-
-    # set the collection of objects for each attribute that it's a select (belongs_to)
-    # to populate the <select></select>s
-    def set_belongs_to_collections
-      @model.relationships_of('belongs_to').each do |class_variable|
-        set_relationship(class_variable)
-      end
-    end
-
-    # set the collection of objects for each attribute that it's a checkbox (has_many)
-    def set_has_many_collections
-      @model.relationships_of('has_many').each do |class_variable|
-        set_relationship(class_variable)
-      end
+    def set_resource_collection
+      @collection = @model.all
     end
 
-    def set_relationship(class_variable)
-      if class_variable.respond_to?('of_model')
-        @collections.merge!({"#{class_variable}" => class_variable.of_model(@model.display_name)})
+    def set_resource_instance
+      if @model.respond_to? :friendly
+        @resource_instance ||= @model.friendly.find(params[:id])
       else
-        @collections.merge!({"#{class_variable}" => class_variable.all})
+        @resource_instance ||= @model.find(params[:id])
       end
     end
 
@@ -113,24 +100,12 @@ module Adminpanel
       "#{resource}_params"
     end
 
-    def set_resource_instance
-      if @model.respond_to? :friendly
-        @resource_instance = @model.friendly.find(params[:id])
-      else
-        @resource_instance = @model.find(params[:id])
-      end
-    end
-
-    def set_resource_collection
-      @collection = @model.all
-    end
-
     def render_new(format)
       format.html do
         render 'adminpanel/templates/new'
       end
       format.js do
-        render 'adminpanel/templates/new', locals: { resource: @resource_instance }
+        render 'adminpanel/templates/new'
       end
     end
   end

data/app/controllers/concerns/adminpanel/sortable_actions.rb

@@ -3,16 +3,8 @@ module Adminpanel
     extend ActiveSupport::Concern
 
     def move_to_position
-      if @model.respond_to? :friendly
-        resource = @model.friendly.find(params[:id])
-      else
-        resource = @model.find(params[:id])
-      end
-
-      resource = @model.find(params[:id])
-
-      resource.move_to_position(params[:position].to_i)
-      render json: {status: :ok}
+      @resource_instance.move_to_position(params[:position].to_i)
+      render json: { status: :ok }
     end
   end
 end

data/app/helpers/adminpanel/adminpanel_form_builder.rb

@@ -23,12 +23,12 @@ module Adminpanel
       end
     end
 
-    def text_field(name, *args)
-      base_layout name, *args, 'text_field_original'
+    def text_field(method, *args)
+      base_layout method, *args, 'text_field_original'
     end
 
-    def file_field(name, *args)
-      image_input = base_layout(name, *args, 'file_field_original')
+    def file_field(method, *args)
+      image_input = base_layout(method, *args, 'file_field_original')
 
       if !object.nil? && !object.new_record? #if not new record
         "#{thumbnail_layout(name)}#{image_input}".html_safe
@@ -37,11 +37,11 @@ module Adminpanel
       end
     end
 
-    def non_image_file_field(name, *args)
-      file_input = base_layout(name, *args, 'file_field_original')
+    def non_image_file_field(method, *args)
+      file_input = base_layout(method, *args, 'file_field_original')
 
       if !object.nil? && !object.new_record? #if not new record
-        "#{title_layout(name)}#{file_input}".html_safe
+        "#{title_layout(method)}#{file_input}".html_safe
       else
         file_input
       end
@@ -51,16 +51,16 @@ module Adminpanel
       base_layout name, *args, 'gallery_base'
     end
 
-    def wysiwyg_field(name, *args)
+    def wysiwyg_field(method, *args)
 
       options = args.extract_options!
       options.reverse_merge! class: 'wysihtml5 span7'
 
-      base_layout name, options, 'text_area_original'
+      base_layout method, options, 'text_area_original'
     end
 
-    def text_area(name, *args)
-      base_layout name, *args, 'text_area_original'
+    def text_area(method, *args)
+      base_layout method, *args, 'text_area_original'
     end
 
     # def radio_button_group(name, buttons, options)
@@ -78,26 +78,23 @@ module Adminpanel
     # 	end
     # end
 
-    def checkbox(checkbox_object, form_object_name, relationship)
-      @template.content_tag(
-        :label,
-        @template.check_box_tag(
-          "#{form_object_name}[#{relationship}][]",
-          checkbox_object.id,
-          self.object.send(relationship).include?(checkbox_object.id)
-          ) + checkbox_object.name,
-        class: "checkbox"
-      )
+    def collection_check_boxes(method, collection, value_method, text_method, options = {}, html_options = {})
+      super method, collection, value_method, text_method, options, html_options do |b|
+        b.label class: 'checkbox' do
+          b.check_box +
+          b.label
+        end
+      end
     end
 
-    def boolean(name, *args)
-      base_layout name, *args, 'boolean_base'
+    def boolean(method, *args)
+      base_layout method, *args, 'boolean_base'
     end
 
-    def enum_field(name, *args)
+    def enum_field(method, *args)
       select(
-        name,
-        self.object.class.send(name.pluralize).map{|option, value|
+        method,
+        self.object.class.send(method.pluralize).map{|option, value|
           [I18n.t("#{self.object.class.name.demodulize.downcase}.#{option}"), option]
         },
         *args
@@ -106,8 +103,6 @@ module Adminpanel
 
     def resource_select(name, *args)
       select name, Adminpanel.displayable_resources.map{|resource| [symbol_class(resource).display_name, resource.to_s]}, *args
-      # select name, Adminpanel.displayable_resources.map{|resource| ['resource', 'resource']}, *args
-
     end
 
     def select(name, select_options, *args)

data/app/helpers/adminpanel/shared_pages_helper.rb

@@ -50,14 +50,14 @@ module Adminpanel
       ).url_for_oauth_code
     end
 
-    def field_value properties, attribute, object
+    def field_value(properties, attribute, object)
       case properties['type']
-      when 'belongs_to'
-        belong_to_object_name(object, attribute.split('_id').first)
-      when 'has_many'
+      when 'select'
+        belong_to_object_name(object, attribute.gsub('_id', ''))
+      when 'checkbox'
         li_tags = ""
         content_tag :ul do
-          object.send("#{pluralize_model(properties['model'])}").each do |member|
+          object.send(attribute.gsub('_ids', '').pluralize).each do |member|
             li_tags << content_tag(:li, class: 'priority-low') do
               member.name
             end
@@ -76,6 +76,8 @@ module Adminpanel
         end
       when 'enum_field'
         I18n.t("#{object.class.name.demodulize.downcase}.#{object.send(attribute)}")
+      when 'adminpanel_file_field'
+        object.send(attribute).count
       else
         object.send(attribute)
       end
@@ -83,11 +85,13 @@ module Adminpanel
 
     def is_customized_field?(field_name)
       field_name = field_name.to_sym
-      return (field_name == :adminpanel_file_field ||
-        field_name == :belongs_to ||
-        field_name == :file_field ||
-        field_name == :non_image_file_field ||
-        field_name == :has_many)
+      [
+        :adminpanel_file_field,
+        :file_field,
+        :non_image_file_field,
+        :checkbox,
+        :select
+      ].include? field_name
     end
 
     def table_type(model)

data/app/models/adminpanel/analytic.rb

@@ -1,11 +1,19 @@
 module Adminpanel
-  class Analytic # PORO
-    include Adminpanel::Base
+  class Analytic
+    # include Adminpanel::Base
+
+    def name
+      'analytic'
+    end
 
     def self.display_name
       I18n.t("model.Analytic")
     end
 
+    def self.collection_name
+      display_name
+    end
+
     def self.icon
       "dashboard"
     end

data/app/models/adminpanel/permission.rb

@@ -26,10 +26,11 @@ module Adminpanel
       [
         {
           'role_id' => {
-            'type' => 'belongs_to',
+            'type' => 'select',
             'label' => I18n.t('permission.role'),
-            'model' => 'Adminpanel::Role',
-            # 'remote_resource' => false
+            'options' => Proc.new {|object|
+              Adminpanel::Role.all.map {|o| [o.id, o.name]}
+            }
           }
         },
         {

data/app/models/adminpanel/role.rb

@@ -23,9 +23,11 @@ module Adminpanel
         },
         {
           'permission_ids' => {
-            'type' => 'has_many',
-            'model' => "Adminpanel::Permission",
-            'label' => 'Permisos'
+            'label' => 'Permisos',
+            'type' => 'checkbox',
+            'options' => Proc.new { |object|
+              Adminpanel::Permission.all
+            },
           }
         }
       ]

data/app/models/adminpanel/user.rb

@@ -66,10 +66,10 @@ module Adminpanel
         },
         {
           'role_id' => {
-            'type' => 'belongs_to',
-            'model' => 'Adminpanel::Role',
-            # 'remote_resource' => false,
-            'placeholder' => I18n.t('model.attributes.role_id'),
+            'type' => 'select',
+            'options' => Proc.new { |user|
+              Role.all.map { |r| [r.id, r.name] }
+            },
             'label' => I18n.t('model.attributes.role_id')
           }
         },

data/app/models/concerns/adminpanel/base.rb

@@ -2,10 +2,9 @@ module Adminpanel
   module Base
     extend ActiveSupport::Concern
 
-    # static(class) methods
     module ClassMethods
 
-      # API methods
+      # Adminpanel API
       def mount_images(relation)
         has_many relation, dependent: :destroy
         accepts_nested_attributes_for relation, allow_destroy: true

data/app/models/concerns/adminpanel/friendly.rb

@@ -0,0 +1,28 @@
+module Adminpanel
+  module Friendly
+    extend ActiveSupport::Concern
+
+    included do
+      extend FriendlyId
+
+      friendly_id :slug_candidates, use: :slugged
+
+      before_validation :make_slug_nil, if: Proc.new { |object|
+        object.name_changed?
+      }, prepend: true
+    end
+
+    private
+
+      def slug_candidates
+        [
+          :name,
+          :id
+        ]
+      end
+
+      def make_slug_nil
+        self.slug = nil
+      end
+  end
+end