adminpanel 2.2.5 → 2.3.0

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

@@ -2,7 +2,7 @@ module Adminpanel
   module SitemapActions
     extend ActiveSupport::Concern
     included do
-      before_filter :set_default_host, only:[:create, :update, :destroy]
+      before_action :set_default_host, only:[:create, :update, :destroy]
     end
 
     protected

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

@@ -0,0 +1,29 @@
+module Adminpanel
+  module SortableActions
+    extend ActiveSupport::Concern
+
+    def move_to_better
+      resource = @model.find(params[:id])
+      resource.move_to_better_position
+      update_index_table
+
+    end
+
+    def move_to_worst
+      resource = @model.find(params[:id])
+      resource.move_to_worst_position
+      update_index_table
+    end
+
+  protected
+    def update_index_table
+      respond_to do |format|
+        format.js do
+          render 'adminpanel/shared/index_records', locals: {
+            collection: @model.all
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -3,19 +3,19 @@ module Adminpanel
     extend ActiveSupport::Concern
 
     included do
-      before_filter :get_twitter_token, only:[:index, :create, :update, :destroy, :show, :twitter_publish]
+      before_action :get_twitter_token, only:[:index, :create, :update, :destroy, :show, :twitter_publish]
     end
 
     def twitter_publish
-      resource.twitter_message = params[model_name][:twitter_message]
-      if !@twitter_token.nil? && !@twitter_secret.nil? && resource.has_valid_tweet?
+      @resource_instance.twitter_message = params[model_name][:twitter_message]
+      if !@twitter_token.nil? && !@twitter_secret.nil? && @resource_instance.has_valid_tweet?
         client = get_twitter_token
-        client.update(resource.twitter_message)
+        client.update(@resource_instance.twitter_message)
         flash[:success] = I18n.t('twitter.posted', user: @twitter_token.name)
       else
         flash[:error] = I18n.t('twitter.not-posted')
       end
-      redirect_to resource
+      redirect_to @resource_instance
     end
 
   private

data/app/helpers/adminpanel/adminpanel_form_builder.rb

@@ -8,13 +8,26 @@ module Adminpanel
     alias_method :number_field_original, :number_field
     alias_method :email_field_original, :email_field
     alias_method :file_field_original, :file_field
-    # alias_method :select_original, :select
 
-    def text_field name, *args
+    def body(&block)
+      @template.content_tag :div, class: 'widget-body' do
+        @template.content_tag :div, class: 'widget-forms clearfix' do
+          yield
+        end
+      end
+    end
+
+    def footer(&block)
+      @template.content_tag :div, class: 'widget-footer' do
+        yield
+      end
+    end
+
+    def text_field(name, *args)
       base_layout name, *args, 'text_field_original'
     end
 
-    def file_field name, *args
+    def file_field(name, *args)
       image_input = base_layout(name, *args, 'file_field_original')
 
       if !object.nil? && !object.new_record? #if not new record
@@ -24,11 +37,21 @@ module Adminpanel
       end
     end
 
-    def gallery_field name, *args
+    def non_image_file_field(name, *args)
+      file_input = base_layout(name, *args, 'file_field_original')
+
+      if !object.nil? && !object.new_record? #if not new record
+        "#{title_layout(name)}#{file_input}".html_safe
+      else
+        file_input
+      end
+    end
+
+    def gallery_field(name, *args)
       base_layout name, *args, 'gallery_base'
     end
 
-    def wysiwyg_field name, *args
+    def wysiwyg_field(name, *args)
 
       options = args.extract_options!
       options.reverse_merge! class: 'wysihtml5 span7'
@@ -36,7 +59,7 @@ module Adminpanel
       base_layout name, options, 'text_area_original'
     end
 
-    def text_area name, *args
+    def text_area(name, *args)
       base_layout name, *args, 'text_area_original'
     end
 
@@ -55,7 +78,7 @@ module Adminpanel
     # 	end
     # end
 
-    def checkbox checkbox_object, form_object_name, relationship
+    def checkbox(checkbox_object, form_object_name, relationship)
       @template.content_tag(
         :label,
         @template.check_box_tag(
@@ -63,19 +86,25 @@ module Adminpanel
           checkbox_object.id,
           self.object.send(relationship).include?(checkbox_object.id)
           ) + checkbox_object.name,
-        :class => "checkbox"
+        class: "checkbox"
       )
     end
 
-    def boolean name, *args
+    def boolean(name, *args)
       base_layout name, *args, 'boolean_base'
     end
 
-    def enum_field name, *args
-      select name, self.object.class.actions.map{|action, value| [I18n.t("#{self.object.class.name.demodulize.downcase}.#{action}"), action]}, *args
+    def enum_field(name, *args)
+      select(
+        name,
+        self.object.class.send(name.pluralize).map{|option, value|
+          [I18n.t("#{self.object.class.name.demodulize.downcase}.#{option}"), option]
+        },
+        *args
+      )
     end
 
-    def resource_select name, *args
+    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
 
@@ -86,11 +115,11 @@ module Adminpanel
       label = options['label']
       options.delete('label')
 
-      options.reverse_merge! :class => 'span7', :include_blank => '(Seleccione por favor)';
+      options.reverse_merge! class: 'span7', include_blank: '(Seleccione por favor)';
 
-      @template.content_tag :div, :class => "control-group" do
-        @template.content_tag(:label, label, :class => "control-label") +
-        @template.content_tag(:div, super(name, select_options, options), :class => "controls")
+      @template.content_tag :div, class: "control-group" do
+        @template.content_tag(:label, label, class: "control-label") +
+        @template.content_tag(:div, super(name, select_options, options), class: "controls")
       end
     end
 
@@ -109,7 +138,12 @@ module Adminpanel
     def submit(name, *args)
       options = args.extract_options!
 
-      options.reverse_merge! :class => "btn btn-primary"
+      options.reverse_merge!(
+        class: 'btn btn-primary',
+        data: {
+          disable_with: I18n.t('action.submitting')
+        }
+      )
       super(name, *args << options)
     end
 
@@ -170,67 +204,73 @@ module Adminpanel
     #     )
     #   end
     # end
-
     private
 
-    def base_layout(name, *args, input_type)
-      options = args.extract_options!
-      options.reverse_merge! class: 'span7'
-      label = options['label']
-      options.delete('label')
+      def base_layout(name, *args, input_type)
+        options = args.extract_options!
+        options.reverse_merge! class: 'span7'
+        label = options['label']
+        options.delete('label')
 
-      @template.content_tag :div, :class => 'control-group' do
-        @template.content_tag(:label, label, :class => 'control-label') +
-        @template.content_tag(:div, :class => 'controls') do
-          self.send(input_type, name, options)
+        @template.content_tag :div, class: 'control-group' do
+          @template.content_tag(:label, label, class: 'control-label') +
+          @template.content_tag(:div, class: 'controls') do
+            self.send(input_type, name, options)
+          end
         end
       end
-    end
 
-    def datepickerize_base(name, options)
-      options.reverse_merge! 'value' => Time.now.strftime("%d-%m-%Y")
-      @template.content_tag(
-                :div,
-                class: 'input-append date datepicker datepicker-basic',
-                data: {
-                  date_format: 'dd-mm-yyyy',
-                  date: options['value']
-                }
-              ) do
-        text_field_original(name, options) +
-        (
-          @template.content_tag :span, class: 'add-on' do
-            @template.content_tag :i, nil, class: 'fa fa-th'
-          end
-        )
+      def datepickerize_base(name, options)
+        options.reverse_merge! 'value' => Time.now.strftime("%d-%m-%Y")
+        @template.content_tag(
+                  :div,
+                  class: 'input-append date datepicker datepicker-basic',
+                  data: {
+                    date_format: 'dd-mm-yyyy',
+                    date: options['value']
+                  }
+                ) do
+          text_field_original(name, options) +
+          (
+            @template.content_tag :span, class: 'add-on' do
+              @template.content_tag :i, nil, class: 'fa fa-th'
+            end
+          )
+        end
       end
-    end
 
-    def boolean_base(name, options)
-      @template.content_tag :label, class: 'checkbox' do
-        check_box(name)
+      def boolean_base(name, options)
+        @template.content_tag :label, class: 'checkbox' do
+          check_box(name)
+        end
       end
-    end
 
-    def gallery_base(name, options)
-      file_field_input = file_field_original(name, options)
-      hidden_input = hidden_field(:_destroy)
-      delete_button = @template.content_tag(:button, I18n.t("action.delete"), :class => "btn btn-danger remove_fields")
+      def gallery_base(name, options)
+        file_field_input = file_field_original(name, options)
+        hidden_input = hidden_field(:_destroy)
+        delete_button = @template.content_tag(:button, I18n.t("action.delete"), class: "btn btn-danger remove-fields")
 
-      if object.nil? || object.new_record?
-        "#{file_field_input}#{hidden_input}#{delete_button}".html_safe
-      else
-        "#{thumbnail_layout(name)}#{file_field_input}#{hidden_input}#{delete_button}".html_safe
+        if object.nil? || object.new_record?
+          "#{file_field_input}#{hidden_input}#{delete_button}".html_safe
+        else
+          "#{thumbnail_layout(name)}#{file_field_input}#{hidden_input}#{delete_button}".html_safe
+        end
       end
-    end
 
-    def thumbnail_layout(attribute)
-      @template.content_tag :div, :class => 'control-group' do
-        @template.content_tag :div, :class => 'controls' do
-          @template.image_tag self.object.send("#{attribute}_url", :thumb)
+      def thumbnail_layout(attribute)
+        @template.content_tag :div, class: 'control-group' do
+          @template.content_tag :div, class: 'controls' do
+            @template.image_tag self.object.send("#{attribute}_url", :thumb)
+          end
         end
       end
-    end
 
-  end
+      def title_layout(attribute)
+        @template.content_tag :div, class: 'control-group' do
+          @template.content_tag :div, class: 'controls' do
+            @template.content_tag(:i, I18n.t('adminpanel.form.server_file', file: self.object["#{attribute}"]))
+          end
+        end
+      end
+    end
 end

data/app/helpers/adminpanel/application_helper.rb

@@ -6,7 +6,7 @@ module Adminpanel
 
     def adminpanel_form_for(name, *args, &block)
       options = args.extract_options!
-      options.reverse_merge! :builder => Adminpanel::AdminpanelFormBuilder, :html => { :class => "form-horizontal" }
+      options.reverse_merge! builder: Adminpanel::AdminpanelFormBuilder, html: { class: "form-horizontal" }
 
       form_for(name, *(args << options), &block)
     end
@@ -23,17 +23,28 @@ module Adminpanel
     def is_current_section?(display_name)
       display_name == params[:controller].classify.constantize.display_name ? 'active' : nil
     end
-    
-    def link_to_add_fields(name, f, association)
+
+    def link_to_add_fields(name, f, association, hidden='not-hidden')
       new_object = f.object.send(association).klass.new
       id = new_object.object_id
-      fields = f.fields_for(association, new_object, :child_index => id) do |builder|
-        render("shared/image_fields", :f => builder)
+      fields = f.fields_for(association, new_object, child_index: id) do |builder|
+        render('adminpanel/shared/image_fields', f: builder)
+      end
+      add_another_image_button = content_tag(:div, id: 'new-image-button') do
+        content_tag(:button, class: 'btn btn-success btn-mini') do
+          content_tag(:h6, name)
+        end
       end
-      link_to(content_tag(:div, content_tag(:button,
-            content_tag(:h6, name, :id => "add-image-button"),
-             :class => "btn btn-success btn-mini"), :class => "mws-form-row"),
-      '#', :class => "add_fields", :data => {:id => id, :fields => fields.gsub("\n", "")})
+      link_to(
+        add_another_image_button,
+        '#',
+        class: "add-fields #{hidden}",
+        id: 'add-image-link',
+        data: {
+          id: id,
+          fields: fields.gsub("\n", "")
+        }
+      )
     end
 
     def route_symbol(model_name)

data/app/helpers/adminpanel/breadcrumbs_helper.rb

@@ -6,12 +6,12 @@ module Adminpanel
     end
 
     def render_breadcrumb(divider)
-      render partial: 'shared/breadcrumb', locals: { nav: initialize_breadcrumb, divider: divider }
+      render partial: 'adminpanel/shared/breadcrumb', locals: { nav: initialize_breadcrumb, divider: divider }
     end
 
     private
     def initialize_breadcrumb
-      @breadcrumb ||= [{ title: 'Inicio', url: adminpanel.root_url }, ]
+      @breadcrumb ||= [{ title: I18n.t('breadcrumb.index'), url: adminpanel.root_url }, ]
     end
 
   end

data/app/helpers/adminpanel/router_helper.rb

@@ -16,6 +16,10 @@ module Adminpanel
       resource_class(resource).twitter_share?
     end
 
+    def is_sortable?(resource)
+      resource_class(resource).is_sortable?
+    end
+
     def member_routes(resource)
       resource_class(resource).member_routes
     end
@@ -33,9 +37,9 @@ module Adminpanel
         }
       }
     end
-  private
-    def resource_class(resource)
-      "adminpanel/#{resource.to_s.singularize}".classify.constantize
-    end
+    private
+      def resource_class(resource)
+        "adminpanel/#{resource.to_s.singularize}".classify.constantize
+      end
   end
 end

data/app/helpers/adminpanel/shared_pages_helper.rb

@@ -1,14 +1,15 @@
 module Adminpanel
   module SharedPagesHelper
-    def belong_to_object_name(resource, belong_to_assoc_name)
-      @model.reflect_on_all_associations.each do |association|
-        if association.name.to_s == belong_to_assoc_name.to_s
-          if !resource.send(association.name.to_s).nil? #if there's something in the association
-            return resource.send(association.name).name
-          else
-            return "N/A #{association.klass.to_s}"
-          end
-        end
+    ### Searches for current controller's Class (@model) associaciations
+    # and execute the association method on the model, It's going
+    # to return 'name' of the related object if it exists.
+    # E.x. Given a Prodcuct that belongs_to category, this method
+    # is going to search for a relationship named 'category'
+    def belong_to_object_name(resource, belongs_to_assoc_name)
+      if !resource.send(belongs_to_assoc_name).nil? #if there's something in the association
+        return resource.send(belongs_to_assoc_name).name
+      else
+        return "#{belongs_to_assoc_name} N/A"
       end
     end
 
@@ -30,9 +31,9 @@ module Adminpanel
 
     def active_tab(index)
       if index == 0
-        return "active"
+        return 'active'
       else
-        return ""
+        return ''
       end
     end
 
@@ -49,5 +50,52 @@ module Adminpanel
       ).url_for_oauth_code
     end
 
+    def field_value properties, attribute, object
+      case properties['type']
+      when 'belongs_to'
+        belong_to_object_name(object, attribute.split('_id').first)
+      when 'has_many'
+        li_tags = ""
+        content_tag :ul do
+          object.send("#{pluralize_model(properties['model'])}").each do |member|
+            li_tags << content_tag(:li, class: 'priority-low') do
+              member.name
+            end
+          end
+          li_tags.html_safe
+        end
+      when 'file_field'
+        content_tag :ul do
+          image_tag(object.send("#{attribute}_url", :thumb))
+        end
+      when 'boolean'
+        if object.send(attribute)
+          I18n.t('action.is_true')
+        else
+          I18n.t('action.is_false')
+        end
+      when 'enum_field'
+        I18n.t("#{object.class.name.demodulize.downcase}.#{object.send(attribute)}")
+      else
+        object.send(attribute)
+      end
+    end
+
+    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)
+    end
+
+    def table_type(model)
+      if model.is_sortable?
+        ''
+      else
+        'information-table'
+      end
+    end
   end
 end