adminpanel 2.2.5 → 2.3.0

data/app/models/ability.rb

@@ -5,10 +5,10 @@ class Ability
   def initialize(user)
 
     if user.nil?
-    elsif user.rol.name == 'Admin'
+    elsif user.role.name == 'Admin'
       can :manage, :all
     else
-      user.rol.permissions.each do |permission|
+      user.role.permissions.each do |permission|
         if permission.to_read?
           can :read, symbol_class(permission.resource)
         elsif permission.to_publish?

data/app/models/adminpanel/analytic.rb

@@ -1,13 +1,13 @@
 module Adminpanel
-  class Analytic #< ActiveRecord::Base
+  class Analytic # PORO
     include Adminpanel::Base
 
     def self.display_name
-      I18n.t('model.Analytic')
+      I18n.t("model.Analytic")
     end
 
     def self.icon
-      'dashboard'
+      "dashboard"
     end
 
   end

data/app/models/adminpanel/permission.rb

@@ -3,32 +3,32 @@ module Adminpanel
     include Adminpanel::Base
     include ApplicationHelper
 
-    enum action: [ :to_read, :to_publish, :to_create, :to_update,
-      :to_destroy, :to_manage ]
+    enum action: [
+                  :to_read,
+                  :to_publish,
+                  :to_create,
+                  :to_update,
+                  :to_destroy,
+                  :to_manage
+                ]
 
-    belongs_to :rol
+    belongs_to :role, touch: true
+
+    # validates_presence_of :action
+    validates_presence_of :role_id
+    validates_presence_of :resource
 
     def name
-      "#{action} #{symbol_class(self['resource']).display_name}"
+      "#{I18n.t("#{self.class.name.demodulize.downcase}.#{self.action}")} #{symbol_class(self['resource']).display_name}"
     end
 
-    # def action
-    #   Permission.actions.each do |key, value|
-    #     return I18n.t("permission.#{key}") if value == self['action']
-    #   end
-    # end
-
-    # def resource
-    #   symbol_class(self['resource']).display_name.to_s.pluralize(I18n.default_locale)
-    # end
-
     def self.form_attributes
       [
         {
-          'rol_id' => {
+          'role_id' => {
             'type' => 'belongs_to',
-            'label' => I18n.t('permission.rol'),
-            'model' => 'Adminpanel::Rol',
+            'label' => I18n.t('permission.role'),
+            'model' => 'Adminpanel::Role',
             # 'remote_resource' => false
           }
         },
@@ -48,11 +48,11 @@ module Adminpanel
     end
 
     def self.display_name
-      'Permiso' #singular
+      I18n.t('model.Permission') # singular
     end
 
     def self.icon
-      "gavel" # fa-{icon}
+      'gavel' # fa-{icon}
     end
   end
 end

data/app/models/adminpanel/{rol.rb → role.rb}

@@ -1,10 +1,17 @@
 module Adminpanel
-  class Rol < ActiveRecord::Base
+  class Role < ActiveRecord::Base
     include Adminpanel::Base
+
     has_many :permissions
+    has_many :users
+
     validates_presence_of :name
     validates_uniqueness_of :name
 
+    default_scope do
+      includes(:permissions)
+    end
+
     def self.form_attributes
       [
         {
@@ -25,7 +32,7 @@ module Adminpanel
     end
 
     def self.display_name
-      'Rol'
+      I18n.t('model.Role')
     end
 
     def self.icon

data/app/models/adminpanel/section.rb

@@ -4,7 +4,7 @@ module Adminpanel
   class Section < ActiveRecord::Base
     include Adminpanel::Base
 
-    mount_images :images
+    mount_images :sectionfiles
 
     validates_length_of :description,
         minimum: 10,
@@ -27,13 +27,17 @@ module Adminpanel
     VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
     validates_format_of :description, with: VALID_EMAIL_REGEX, if: :is_email?
 
-    default_scope { order("page ASC") }
+    default_scope do
+      order("page ASC")
+    end
 
-    scope :of_page, lambda{ |page|
+    scope :of_page, -> (page) do
       where(page: page)
-    }
+    end
 
-    scope :with_description, -> { where.not( description: '') }
+    scope :with_description, -> do
+      where.not( description: '')
+    end
 
     def self.form_attributes
       [
@@ -49,7 +53,7 @@ module Adminpanel
     end
 
     def self.display_name
-      'Seccion'
+      I18n.t('model.Section')
     end
 
     def description

data/app/models/adminpanel/{image.rb → sectionfile.rb}

@@ -1,5 +1,5 @@
 module Adminpanel
-  class Image < ActiveRecord::Base
+  class Sectionfile < ActiveRecord::Base
     include Adminpanel::Base
 
     validates_presence_of :file

data/app/models/adminpanel/user.rb

@@ -2,36 +2,36 @@ module Adminpanel
   class User < ActiveRecord::Base
     include Adminpanel::Base
     has_secure_password
-    belongs_to :rol
+    belongs_to :role, touch: true
 
-  #rol validation
-    validates_presence_of :rol_id
+    default_scope do
+      includes(:role)
+    end
+
+    #role validation
+    validates_presence_of :role_id
 
-  #name validations
+    #name validations
     validates_presence_of :name
-    validates_length_of :name, :maximum => 25
+    validates_length_of :name, maximum: 25
 
-  #password validations
-    validates_confirmation_of :password, :on => :create
-    validates_presence_of :password, :on => :create
-    validates_length_of :password, :minimum => 6, :on => :create
+    #password validations
+    validates_confirmation_of :password, on: :create
+    validates_presence_of :password, on: :create
+    validates_length_of :password, minimum: 6, on: :create
 
-  #password_confirmation validations
-    validates_presence_of :password_confirmation, :on => :create
+    #password_confirmation validations
+    validates_presence_of :password_confirmation, on: :create
 
-  #email validations
+    #email validations
     validates_presence_of :email
     validates_uniqueness_of :email
     VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
-    validates_format_of :email, :with => VALID_EMAIL_REGEX
+    validates_format_of :email, with: VALID_EMAIL_REGEX
 
     before_save{ email.downcase! }
     before_save :create_remember_token
 
-    def has_role?(role_sym)
-      roles.any? { |r| r.name.underscore.to_sym == role_sym }
-    end
-
     def self.form_attributes
       [
         {
@@ -65,33 +65,29 @@ module Adminpanel
           }
         },
         {
-          'rol_id' => {
+          'role_id' => {
             'type' => 'belongs_to',
-            'model' => 'Adminpanel::Rol',
+            'model' => 'Adminpanel::Role',
             # 'remote_resource' => false,
-            'placeholder' => I18n.t('model.attributes.rol_id'),
-            'label' => I18n.t('model.attributes.rol_id')
+            'placeholder' => I18n.t('model.attributes.role_id'),
+            'label' => I18n.t('model.attributes.role_id')
           }
         },
       ]
     end
 
-    def root_url
-      self.rol.permissions.first
-    end
-
-    def self.display_name
-      'Usuario'
-    end
-
-    def User.new_remember_token
+    def self.new_remember_token
       SecureRandom.urlsafe_base64
     end
 
-    def User.digest(token)
+    def self.digest(token)
       Digest::SHA1.hexdigest(token.to_s)
     end
 
+    def self.display_name
+      I18n.t('model.User')
+    end
+
     def self.icon
       'user'
     end

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

@@ -3,10 +3,15 @@ module Adminpanel
     extend ActiveSupport::Concern
     #instance methods
     # static(class) methods
+
     module ClassMethods
       def mount_images(relation)
-        has_many relation, :dependent => :destroy
-        accepts_nested_attributes_for relation, :allow_destroy => true
+        has_many relation, dependent: :destroy
+        accepts_nested_attributes_for relation, allow_destroy: true
+      end
+
+      def belongs_to(name, scope = nil, options = {})
+        super(name, scope, options.reverse_merge!({touch: true}))
       end
 
       def form_attributes
@@ -21,7 +26,7 @@ module Adminpanel
         form_attributes.each do |attribute|
           attribute.each do |name, properties|
             if name == field
-              return properties["label"]
+              return properties['label']
             end
           end
         end
@@ -32,9 +37,14 @@ module Adminpanel
         display_attributes = []
         form_attributes.each do |attribute|
           attribute.each do |name, properties|
-            if properties['show'].nil? ||
+            if (
+              properties['show'].nil? ||
               properties['show'] == 'true' ||
-              properties['show'] == type
+              (
+                properties['show'] == type &&
+                properties['type'] != 'adminpanel_file_field' #file fields get only displayed in form
+              )
+            )
               display_attributes << attribute
             end
           end
@@ -45,35 +55,35 @@ module Adminpanel
 
       def has_images?
         form_attributes.each do |fields|
-        fields.each do |attribute, properties|
-          if properties['type'] == 'adminpanel_file_field'
-            return true
+          fields.each do |attribute, properties|
+            if properties['type'] == 'adminpanel_file_field'
+              return true
+            end
           end
         end
-        end
         return false
       end
 
       def get_image_relationship
         form_attributes.each do |fields|
-        fields.each do |attribute, properties|
-          if properties['type'] == 'adminpanel_file_field'
-            return attribute
+          fields.each do |attribute, properties|
+            if properties['type'] == 'adminpanel_file_field'
+              return attribute
+            end
           end
         end
-        end
         return false
       end
 
       def relationships_of(type_property)
         classes_of_relation = []
         form_attributes.each do |fields|
-        fields.each do |attribute, properties|
-          if properties['type'] == type_property
-            classes_of_relation << properties['model'].classify.constantize
+          fields.each do |attribute, properties|
+            if properties['type'] == type_property
+              classes_of_relation << properties['model'].classify.constantize
+            end
           end
         end
-        end
         return classes_of_relation
       end
 
@@ -90,7 +100,7 @@ module Adminpanel
       end
 
       def has_route?(route)
-        if (!exlude?(route)) && include_route(route)
+        if (!exclude?(route)) && include_route(route)
           true
         else
           false
@@ -113,8 +123,12 @@ module Adminpanel
         []
       end
 
+      def is_sortable?
+        false
+      end
+
     private
-      def exlude?(route)
+      def exclude?(route)
         if routes_options[:except].nil?
           false
         elsif routes_options[:except].include?(route)

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

@@ -5,7 +5,12 @@ module Adminpanel
     included do
       before_create :set_position
       before_destroy :rearrange_positions
-      default_scope { order("position ASC")}
+
+      scope :ordered, -> do
+        order('position ASC')
+        # where(position: 1)
+      end
+
     end
 
     def move_to_better_position
@@ -32,14 +37,14 @@ module Adminpanel
 
         conflicting_gallery.update_attribute(
           :position, conflicting_gallery.position - 1
-          )
+        )
         true
       else
         false
       end
     end
 
-  private
+  protected
     def get_conflicting_gallery(conflicting_position)
       self.class.where(
         self.class.relation_field => self.send(self.class.relation_field)
@@ -47,7 +52,11 @@ module Adminpanel
     end
 
     def rearrange_positions
-      unarranged_galleries = self.class.where(self.class.relation_field => self.send(self.class.relation_field)).where("position > ?", self.position)
+      unarranged_galleries = self.class.where(
+        self.class.relation_field => self.send(
+          self.class.relation_field
+        )
+      ).where('position > ?', self.position)
       unarranged_galleries.each do |gallery|
         gallery.update_attribute(:position, gallery.position - 1)
       end
@@ -55,7 +64,11 @@ module Adminpanel
     end
 
     def set_position
-      last_record = self.class.where(self.class.relation_field => self.send(self.class.relation_field)).last
+      last_record = self.class.where(
+        self.class.relation_field => self.send(
+          self.class.relation_field
+        )
+      ).last
       if last_record.nil?
         self.position = 1
       else

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

@@ -23,7 +23,7 @@ module Adminpanel
         request = url % CGI.escape("#{root_url}/sitemap.xml")
         logger.info root_url
         logger.info "  Pinging #{name} with #{request}"
-        if Rails.env != "development"
+        if !Rails.env.development?
           response = Net::HTTP.get_response(URI.parse(request))
           logger.info "    #{response.code}: #{response.message}"
           logger.info "    Body: #{response.body}"