adminpanel 1.2.12 → 2.0.0

data/app/controllers/adminpanel/users_controller.rb

@@ -2,86 +2,16 @@ module Adminpanel
   class UsersController < Adminpanel::ApplicationController
     # authorize_resource :class => false
     load_and_authorize_resource
-    # GET /admin/users
-    # GET /admin/users.json
-    # def index
-    #   @users = User.all
-    #
-    #   respond_to do |format|
-    #     format.html # index.html.erb
-    #     format.json { render :json => @users }
-    #   end
-    # end
 
-    # GET /admin/users/1
-    # GET /admin/users/1.json
-    # def show
-    #   @user = User.find(params[:id])
-    #
-    #   respond_to do |format|
-    #     format.html # show.html.erb
-    #     format.json { render :json => @user }
-    #   end
-    # end
-    #
-    # # GET /admin/users/new
-    # # GET /admin/users/new.json
-    # def new
-    #   @user = User.new
-    #
-    #   respond_to do |format|
-    #     format.html # new.html.erb
-    #     format.json { render :json => @user }
-    #   end
-    # end
-
-    # GET /admin/users/1/edit
-    # def edit
-    #   @user = User.find(params[:id])
-    # end
-    #
-    # # POST /admin/users
-    # # POST /admin/users.json
-    # def create
-    #   @user = User.new(params[:user])
-    #
-    #   respond_to do |format|
-    #     if @user.save
-    #       format.html { redirect_to @user, :notice => t("user.success") }
-    #       format.json { render :json => @user, :status => :created, :location => @user }
-    #     else
-    #       format.html { render :action => "new" }
-    #       format.json { render :json => @user.errors, :status => :unprocessable_entity }
-    #     end
-    #   end
-    # end
-
-    # PUT /admin/users/1
-    # PUT /admin/users/1.json
-    # def update
-    #   @user = User.find(params[:id])
-    #
-    #   respond_to do |format|
-    #     if @user.update_attributes(params[:user])
-    #       format.html { redirect_to @user, :notice => 'Se ha actualizado con exito.' }
-    #       format.json { head :no_content }
-    #     else
-    #       format.html { render :action => "edit" }
-    #       format.json { render :json => @user.errors, :status => :unprocessable_entity }
-    #     end
-    #   end
-    # end
-
-    # DELETE /admin/users/1
-    # DELETE /admin/users/1.json
-    # def destroy
-    #   @user = User.find(params[:id])
-    #   @user.destroy
-    #
-    #   respond_to do |format|
-    #     format.html { redirect_to users_url }
-    #     format.json { head :no_content }
-    #   end
-    # end
+  private
+    def user_params
+      params.require(:user).permit(
+        :email,
+        :name,
+        :password,
+        :password_confirmation,
+        :group_id
+      )
+    end
   end
 end

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

@@ -0,0 +1,33 @@
+module Adminpanel
+  module GalleryzableActions
+    extend ActiveSupport::Concern
+
+    def move_better
+      respond_to do |format|
+        format.js do
+          resource = @model.find(params[:id])
+          resource.move_to_better_position
+          render 'shared/gallery_entries', :locals => {
+            :collection => @model.where(
+              @model.relation_field.to_sym => resource.send(@model.relation_field)
+            )
+          }
+        end
+      end
+    end
+
+    def move_worst
+      respond_to do |format|
+        format.js do
+          resource = @model.find(params[:id])
+          resource.move_to_worst_position
+          render 'shared/gallery_entries', :locals => {
+            :collection => @model.where(
+              @model.relation_field.to_sym => resource.send(@model.relation_field)
+              )
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,109 @@
+module Adminpanel
+  module RestActions
+
+    def index
+      index! do |format|
+        format.html { render 'shared/index' }
+      end
+    end
+
+    def show
+      show! do |format|
+        format.html { render 'shared/show' }
+      end
+    end
+
+    def new
+      set_collections
+      new! do |format|
+        format.html { render 'shared/new' }
+        format.js { render 'shared/new', :locals => { :resource => resource }}
+      end
+    end
+
+    def create
+      params.merge({:model => params[:model]}) if params[:model].present?
+      params.merge({:model_name => params[:model_name]}) if params[:model_name].present?
+      params.merge({:belongs_request => params[:belongs_request]}) if params[:belongs_request].present?
+      create! do |success, failure|
+        success.html do
+          flash[:success] = I18n.t("action.save_success")
+          redirect_to resource
+        end
+        failure.html do
+          set_collections
+          render 'shared/new'
+        end
+        success.js do
+          flash.now[:success] = I18n.t("action.save_success")
+          if params[:belongs_request]
+            render 'shared/create_belongs_to', :locals => {:resource => resource }
+          else
+            render 'shared/create_has_many', :locals => {:resource => resource }
+          end
+        end
+        failure.js do
+          set_collections
+          render 'shared/new', :locals => {:resource => resource }
+        end
+      end
+    end
+
+
+    def edit
+      edit! do |format|
+        format.html do
+          set_collections
+          render 'shared/edit'
+        end
+      end
+    end
+
+    def update
+      update! do |success, failure|
+        success.html do
+          flash[:success] = I18n.t("action.save_success")
+          render 'shared/index'
+        end
+        failure.html do
+          set_collections
+          render 'shared/edit'
+        end
+      end
+    end
+
+    def destroy
+      destroy! do |format|
+        format.html { render 'shared/index' }
+      end
+    end
+
+    private
+
+    def set_collections
+      @collections = {}
+      set_belongs_to_collections
+      set_has_many_collections
+    end
+
+    def set_belongs_to_collections
+      @model.belongs_to_relationships.each do |class_variable|
+        set_relationship(class_variable)
+      end
+    end
+
+    def set_has_many_collections
+      @model.has_many_relationships.each do |class_variable|
+        set_relationship(class_variable)
+      end
+    end
+
+    def set_relationship(class_variable)
+      if class_variable.respond_to?("of_model")
+        @collections.merge!({"#{class_variable}" => class_variable.of_model(@model.display_name)})
+      else
+        @collections.merge!({"#{class_variable}" => class_variable.all})
+      end
+    end
+  end
+end

data/app/helpers/adminpanel/application_helper.rb

@@ -3,7 +3,6 @@ module Adminpanel
 		include SessionsHelper
 		include BreadcrumbsHelper
 		include SharedPagesHelper
-		include PluralizationsHelper
 
 		def custom_form_for(name, *args, &block)
 			options = args.extract_options!

data/app/helpers/adminpanel/custom_form_builder.rb

@@ -153,8 +153,8 @@ module Adminpanel
 			options.reverse_merge! :class => "span7"
 
 			options.reverse_merge! :include_blank => "(Seleccione por favor)";
-			label = options[:label]
-			options.delete(:label)
+			label = options['label']
+			options.delete('label')
 
 			@template.content_tag :div, :class => "control-group" do
 				@template.content_tag(:label, label, :class => "control-label") +
@@ -167,8 +167,8 @@ module Adminpanel
 
 			options.reverse_merge! :class => "span5"
 			options.reverse_merge! :label => name
-			label = options[:label]
-			options.delete(:label)
+			label = options['label']
+			options.delete('label')
 
 			@template.content_tag :div, :class => "control-group" do
 				@template.content_tag(:label, label, :class => "control-label") +
@@ -180,7 +180,6 @@ module Adminpanel
 			options = args.extract_options!
 
 			options.reverse_merge! :class => "span7"
-			# options.reverse_merge! :label => name
 			label = options['label']
 			options.delete('label')
 
@@ -196,8 +195,8 @@ module Adminpanel
 			options.reverse_merge! :class => "span7"
 			options.reverse_merge! :rows => "10"
 			options.reverse_merge! :label => name
-			label = options[:label]
-			options.delete(:label)
+			label = options['label']
+			options.delete('label')
 
 			@template.content_tag :div, :class => "control-group" do
 				@template.content_tag(:label, label, :class => "control-label") +
@@ -218,8 +217,8 @@ module Adminpanel
 
 			options.reverse_merge! :value => Time.now.strftime("%d-%m-%Y")
 			options.reverse_merge! :label => name
-			label = options[:label]
-			options.delete(:label)
+			label = options['label']
+			options.delete('label')
 
 			@template.content_tag :div, :class => "control-group" do
 				@template.content_tag(:label, label, :class => "control-label") +
@@ -255,8 +254,8 @@ module Adminpanel
 			options = args.extract_options!
 
 			options.reverse_merge! :label => name
-			label = options[:label]
-			options.delete(:label)
+			label = options['label']
+			options.delete('label')
 
 			options.reverse_merge! :symbol => "#"
 			symbol = options[:symbol]
@@ -282,8 +281,8 @@ module Adminpanel
 			options = args.extract_options!
 
 			options.reverse_merge! :label => name
-			label = options[:label]
-			options.delete(:label)
+			label = options['label']
+			options.delete('label')
 
 			options.reverse_merge! :symbol => "#"
 			symbol = options[:symbol]

data/app/helpers/adminpanel/router_helper.rb

@@ -1,7 +1,16 @@
 module Adminpanel
   module RouterHelper
-    def acts_as_a_gallery?(resource)
-      "adminpanel/#{resource}_controller".classify.constantize.resource_class.act_as_a_gallery?
+    def gallery_children(resource)
+      resource_class(resource).gallery_children
+    end
+
+    def resources_parameters(resource)
+      resource_class(resource).routes_options
+    end
+
+  private
+    def resource_class(resource)
+      "adminpanel/#{resource.to_s.singularize}".classify.constantize
     end
   end
 end

data/app/helpers/adminpanel/shared_pages_helper.rb

@@ -5,7 +5,6 @@ module Adminpanel
         if association.klass.to_s == parent_model
         	if !resource.send(association.name).nil?
         		return resource.send(association.name).name
-						# return resource.client
         	else
         		return "N/A #{association.klass.to_s}"
         	end

data/app/models/adminpanel/analytic.rb

@@ -1,12 +1,13 @@
 module Adminpanel
   class Analytic #< ActiveRecord::Base
+    include Adminpanel::Base
 
     def self.display_name
-      "Google Analytics"
+      'Google Analtico'
     end
 
     def self.icon
-      'icon-dashboard'
+      'dashboard'
     end
   end
 end

data/app/models/adminpanel/gallery.rb

@@ -2,12 +2,12 @@ require "carrierwave"
 require "carrierwave/orm/activerecord"
 module Adminpanel
 	class Gallery < ActiveRecord::Base
-	  attr_accessible :file
+		include Adminpanel::Base
 
 	  mount_uploader :file, Adminpanel::GalleryUploader
 	  validates_presence_of :file
 
-		act_as_a_gallery
+		include Adminpanel::Galleryzation
 
 		def move_to_better_position
 			if self.position > 1
@@ -47,11 +47,15 @@ module Adminpanel
 		end
 
 		def self.display_name
-			I18n.t('Gallery')
+			I18n.t('gallery.name')
 		end
 
 		def self.icon
-			'icon-picture'
+			'picture-o'
+		end
+
+		def name
+			File.basename(file.path)
 		end
 
 	private

data/app/models/adminpanel/group.rb

@@ -1,6 +1,6 @@
 module Adminpanel
   class Group < ActiveRecord::Base
-    attr_accessible :name
+    include Adminpanel::Base
 
   end
 end

data/app/models/adminpanel/image.rb

@@ -1,7 +1,6 @@
 module Adminpanel
 	class Image < ActiveRecord::Base
-
-		attr_accessible :file
+		include Adminpanel::Base
 
 		validates_presence_of :file
 

data/app/models/adminpanel/section.rb

@@ -2,27 +2,28 @@ require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 module Adminpanel
 	class Section < ActiveRecord::Base
-	  attr_accessible :description, :has_image, :key, :page, :name, :has_description,
-		:images_attributes, :file
+		include Adminpanel::Base
 
 	  mount_images :images
 
-	  validates_length_of :description, :minimum => 10, :maximum => 10, :on => :update, :if => lambda{|section| section.key == I18n.t('key.telephone')}
+	  validates_length_of :description, :minimum => 10, :maximum => 10, :on => :update, :if => lambda{|section| section.key == 'phone'}, :message => I18n.t('activerecord.errors.messages.not_phone')
 	  validates_presence_of :description, :minimum => 9, :on => :update, :if => lambda{|section| section.has_description == true}
-	  validates :description, :numericality => { :only_integer => true }, :on => :update, :if => lambda{|section| section.key == I18n.t('key.telephone')}
+	  validates :description, :numericality => { :only_integer => true }, :on => :update, :if => lambda{|section| section.key == 'phone'}
 	  validates_presence_of :key
 	  validates_presence_of :name
 	  validates_presence_of :page
+		VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+		validates_format_of :description, :with => VALID_EMAIL_REGEX, if: lambda{|section| section.key == 'email'}
 
 	  default_scope { order("page ASC")}
 
 	  scope :of_page, lambda{|page| where(:page => page)}
 
-		def self.form_methods
+		def self.form_attributes
 			[
-				{'description' => {'name' => 'Descripcion'}},
-				{'name' => {'name' => 'name'}},
-				{'key' => {'name' => 'key'}},
+				{'description' => {'name' => 'Descripcion', 'description' => 'label', 'label' => 'Seccion'}},
+				{'name' => {'name' => 'name', 'label' => 'Seccion'}},
+				{'key' => {'name' => 'key', 'label' => 'Llave'}},
 				{'page' => {'name' => 'page'}},
 				# {'key' => {'name' => 'key'}},
 			]
@@ -30,11 +31,19 @@ module Adminpanel
 		end
 
 	  def self.icon
-	  	"icon-tasks"
+	  	"tasks"
 	  end
 
 		def self.display_name
-			'Secciones'
+			'Seccion'
+		end
+
+		def description
+			if self.has_description
+				return self.attributes['description'].html_safe
+			else
+				return self.attributes['description']
+			end
 		end
 	end
 end