adminpanel 2.5.3 → 2.5.4

data/app/views/adminpanel/form/_checkbox.html.erb

@@ -0,0 +1,45 @@
+<%
+  block = properties['options']
+  args = properties.except('options')
+  collection = block.call(@resource_instance)
+  if collection.class.to_s.demodulize == 'ActiveRecord_Relation'
+    id_method = :id
+    label_method = :name
+  else
+    # collection is an array of arrays:
+    # [
+    #   [123, value],
+    #   [456, value]
+    #   ...
+    # ]
+    id_method = :first
+    label_method = :last
+  end
+%>
+<div class="control-group">
+  <div class="control-label">
+    <%= properties['label'] %>
+  </div>
+  <%= hidden_field_tag("#{class_name_downcase(f.object)}[#{relationship_ids(properties["model"])}][]", nil) %>
+  <div class="controls" id="<%= attribute.gsub('_ids', '') %>-relation">
+    <%= f.collection_check_boxes(
+          attribute,
+          collection,
+          id_method,
+          label_method
+    ) %>
+  </div>
+</div>
+
+<% if !is_modal &&
+  (
+    properties['remote_resource'].nil? ||
+    properties['remote_resource']
+  ) %>
+  <!-- if not making resource from other form so we don't have to manage
+  infinite nested forms and relations -->
+  <%= render(
+      'adminpanel/shared/create_remote_resource_button',
+      remote_model: attribute.gsub('_ids', '')
+  ) %>
+<% end %>

data/app/views/adminpanel/form/_select.html.erb

@@ -0,0 +1,35 @@
+<%
+  block = properties['options']
+  args = properties.except('options')
+  collection = block.call(f.object)
+  if collection.class.to_s.demodulize == 'ActiveRecord_Relation'
+    id_method = :id
+    label_method = :name
+  else
+    id_method = :first
+    label_method = :last
+  end
+  collection = options_from_collection_for_select(
+                  collection,
+                  id_method,
+                  label_method,
+                  @resource_instance.send(attribute)
+                )
+%>
+<%= f.select attribute, collection, { include_blank: true }, args  %>
+
+<% if !is_modal &&
+  (
+    properties['remote_resource'].nil? ||
+    properties['remote_resource']
+  ) %>
+  <!-- if rendering the form inside a modal, so we don't have to
+  manage infinited nested forms and if it's supposed to be
+  created in relation model -->
+
+  <%= render(
+      'adminpanel/shared/create_remote_resource_button',
+      belongs_request: true,
+      remote_model: attribute.gsub('_id', '')
+  ) %>
+<% end %>

data/app/views/adminpanel/shared/_create_remote_resource_button.html.erb

@@ -1,19 +1,16 @@
-<!-- Button to create a new of remote resource if it's supposed to be
-created in relation model -->
-<% demodulized_remote_model_name = remote_resource_name.classify.constantize.model_name.to_s.demodulize.underscore %>
 <%=
 link_to(
   I18n.t('other.add',
-    :model => remote_resource_name.classify.constantize.display_name
+    model: "adminpanel/#{remote_model}".classify.constantize.display_name
   ),
   polymorphic_path(
-    [:new, :"#{demodulized_remote_model_name}"],
+    [:new, :"#{remote_model}"],
     model: @model.display_name,
     model_name: @model.name.demodulize.downcase,
-    belongs_request: defined? belongs_request
+    belongs_request: defined?(belongs_request)
   ),
   class: 'btn btn-info',
-  id: "#{demodulized_remote_model_name}-modal-link",
+  id: "#{remote_model}-modal-link",
   :'data-target' => "#remote-form-modal",
   :'data-toggle' => 'modal',
   remote: true

data/app/views/adminpanel/templates/{create_has_many.js.erb → checkbox.js.erb}

@@ -1,5 +1,5 @@
 var model_name = "<%= params[:model_name] %>";
 var new_model = "<%= @model.name.demodulize.downcase %>";
-row = '<label class="checkbox"><input checked="checked" id="' + model_name + '_' + new_model + '_ids_" name="' + model_name + '[' + new_model + '_ids][]" type="checkbox" value="<%= resource.id %>"><%= resource.name %></label>';
+row = '<label class="checkbox"><input checked="checked" id="' + model_name + '_' + new_model + '_ids_" name="' + model_name + '[' + new_model + '_ids][]" type="checkbox" value="<%= @resource_instance.id %>"><%= @resource_instance.name %></label>';
 $("#" + new_model + "-relation").append(row);
 $("#remote-form-modal").modal('toggle');

data/app/views/adminpanel/templates/{create_belongs_to.js.erb → option_for_select.js.erb}

@@ -1,5 +1,5 @@
 var model_name = "<%= params[:model_name] %>";
 var new_model = "<%= @model.name.demodulize.downcase %>";
-var option = '<option value="<%= resource.id %>" selected="selected"><%= resource.name %></option>';
+var option = '<option value="<%= @resource_instance.id %>" selected="selected"><%= @resource_instance.name %></option>';
 $("#" + model_name + "_" + new_model + "_id").append(option);
 $("#remote-form-modal").modal('toggle');

data/config/locales/es.yml

@@ -3,8 +3,7 @@ es:
     form:
       server_file: 'El archivo en el servidor es: %{file}'
   model:
-    Analytic: 'Analytics'
-    Categories: 'Categorías'
+    Analytic: 'Google Analytics'
     Role: 'Rol'
     User: 'Usuario'
     Permission: 'Permisos'

data/config/routes.rb

@@ -5,7 +5,7 @@ Adminpanel::Engine.routes.draw do
   Adminpanel.displayable_resources.each do |resource|
     case resource
     when :analytics
-      resources :analytics, resources_parameters(resource).merge({ only: [:index] }) do
+      resources :analytics, only: [:index] do
         collection do
           get :google,               to: 'analytics#google', path: 'google'
 

data/lib/adminpanel.rb

@@ -4,6 +4,7 @@ require 'cancancan'
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 require 'coffee-rails'
+require 'friendly_id'
 require 'font-awesome-rails'
 require 'google/api_client'
 require 'instagram'

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = '2.5.3'
+  VERSION = '2.5.4'
 end

data/lib/generators/adminpanel/resource/resource_generator.rb

@@ -23,6 +23,12 @@ module Adminpanel
         when 'wysiwyg'
           fields_to_delete << attribute
           fields << attribute.split(':').first + ':' + 'text'
+        when 'belongs_to'
+          fields_to_delete << attribute
+          fields << attribute.split(':').first + ':' + 'select'
+        when 'has_many'
+          fields_to_delete << attribute
+          fields << attribute.split(':').first + ':' + 'checkbox'
         end
       end
       fields_to_delete.each do |field|

data/lib/generators/adminpanel/resource/resource_generator_helper.rb

@@ -19,11 +19,11 @@ module Adminpanel
       "#{resource_name}_#{@attr_field}".camelize
     end
 
-    def belongs_to_field(resource)
+    def select_field(resource)
       "#{resource.singularize.downcase}_id"
     end
 
-    def has_many_field(resource)
+    def checkbox_field(resource)
       "#{resource.singularize.downcase}_ids"
     end
 
@@ -43,7 +43,7 @@ module Adminpanel
     def is_a_resource?
       fields.each do |attribute|
         assign_attributes_variables(attribute)
-        if @attr_type != 'belongs_to'
+        if @attr_type != 'select'
           return true
         end
       end
@@ -74,11 +74,11 @@ module Adminpanel
       fields.map do |attribute|
         assign_attributes_variables(attribute)
         case @attr_type
-          when 'belongs_to'
-            ':' + belongs_to_field(@attr_field)
-          when 'has_many'
-            "{ #{has_many_field(@attr_field)}: [] }"
-          else
+        when 'select'
+          ":#{select_field(@attr_field)}"
+        when 'checkbox'
+          "{ #{checkbox_field(@attr_field)}: [] }"
+        else
           ":#{attribute.split(':').first}"
         end
       end.join(",\n")
@@ -123,12 +123,12 @@ module Adminpanel
       attribute_hash(gallery_name.pluralize, 'adminpanel_file_field')
     end
 
-    def belongs_to_form_hash
-      attribute_hash(belongs_to_field(@attr_field), 'belongs_to', resource_class_name(@attr_field))
+    def select_form_hash
+      attribute_hash(select_field(@attr_field), 'select', resource_class_name(@attr_field))
     end
 
-    def has_many_form_hash
-      attribute_hash(has_many_field(resource_class_name(@attr_field.downcase.singularize + 's')), 'has_many', @attr_field.capitalize.singularize)
+    def checkbox_form_hash
+      attribute_hash(checkbox_field(resource_class_name(@attr_field.downcase.singularize + 's')), 'checkbox', @attr_field.capitalize.singularize)
     end
 
     def attribute_hash(name, type, model = '')
@@ -155,17 +155,18 @@ module Adminpanel
       "'placeholder' => '#{@attr_field}'"
     end
 
-    def model_type(type)
-      "'model' => 'Adminpanel::#{type}'"
+    def model_type(model_name)
+      "'options' => Proc.new { |object|\n" +
+        indent("Adminpanel::#{model_name}.all\n", 2) +
+      '}'
     end
 
     def has_associations?
       fields.each do |attribute|
         assign_attributes_variables(attribute)
         if( @attr_type == 'images' ||
-            @attr_type == 'belongs_to' ||
-            @attr_type == 'has_many' ||
-            @attr_type == 'has_many_through' ||
+            @attr_type == 'select' ||
+            @attr_type == 'checkbox' ||
             @attr_type == 'file' ||
             has_gallery? )
           return true
@@ -179,10 +180,10 @@ module Adminpanel
       fields.each do |attribute|
         assign_attributes_variables(attribute)
         case @attr_type
-        when 'belongs_to'
-          association = "#{association}#{belongs_to_association(@attr_field)}"
-        when 'has_many' || 'has_many_through'
-          association = "#{association}#{has_many_association(@attr_field)}"
+        when 'select'
+          association = "#{association}#{select_association(@attr_field)}"
+        when 'checkbox'
+          association = "#{association}#{checkbox_association(@attr_field)}"
         when 'file'
           association = "#{association}#{file_assocation(@attr_field)}"
         end
@@ -195,11 +196,11 @@ module Adminpanel
       association
     end
 
-    def belongs_to_association(field)
+    def select_association(field)
       "belongs_to :#{field.singularize.downcase}\n\t\t"
     end
 
-    def has_many_association(field)
+    def checkbox_association(field)
       return "# has_many :#{@attr_field.downcase}zations\n\t\t" +
       "# has_many :#{@attr_field.pluralize.downcase}, " +
       "through: :#{@attr_field.downcase}zations, " +
@@ -207,7 +208,7 @@ module Adminpanel
     end
 
     def file_assocation(field)
-      return "mount_uploader :#{field}, #{class_name}Uploader\n\t\t"
+      "mount_uploader :#{field}, #{class_name}Uploader\n\t\t"
     end
 
   end

data/lib/tasks/adminpanel/adminpanel.rake

@@ -95,12 +95,8 @@ namespace :adminpanel do
             value = Faker::Internet.url
           when 'id' #assign field_id it to a random instance of Adminpanel::field
             field = field.downcase.singularize
-            if field != 'category'
-              value = "adminpanel/#{field}".classify.constantize.order('RAND()').first.id
-            else
-              value = "adminpanel/#{field}".classify.constantize.of_model(@model.display_name).order('RAND()').first.id
-            end
-              field = "#{field}_id"
+            value = "adminpanel/#{field}".classify.constantize.order('RAND()').first.id
+            field = "#{field}_id"
 
           when 'email' #generates a random email
             value = Faker::Internet.email

data/test/dummy/app/models/adminpanel/department.rb

@@ -5,24 +5,26 @@ module Adminpanel
     belongs_to :category
 
     has_many :items
-    has_many :product, :through => :items, :dependent => :destroy
+    has_many :product, through: :items, dependent: :destroy
 
     def self.form_attributes
       [
         {
           'category_id' => {
-            'type' => 'belongs_to',
-            'label' => 'category',
+            'type' => 'select',
             'placeholder' => 'category',
-            'model' => 'Adminpanel::Category',
+            'options' => Proc.new { |object|
+              Adminpanel::Category.all
+            }
           }
         },
         {
           'product_ids' => {
-            'type' => 'has_many',
-            'label' => 'product',
+            'type' => 'checkbox',
             'placeholder' => 'product',
-            'model' => 'Adminpanel::Product',
+            'options' => Proc.new { |object|
+              Adminpanel::Product.all
+            }
           }
         },
         {

data/test/dummy/app/models/adminpanel/item.rb

@@ -9,18 +9,20 @@ module Adminpanel
       [
         {
           'product_id' => {
-            'type' => 'belongs_to',
-            'label' => 'product',
+            'type' => 'select',
             'placeholder' => 'product',
-            'model' => 'Adminpanel::Product',
+            'options' => Proc.new {|object|
+              Adminpanel::Product.all {|o| [o.id, o.name] }
+            }
           }
         },
         {
           'category_id' => {
-            'type' => 'belongs_to',
-            'label' => 'category',
+            'type' => 'select',
             'placeholder' => 'category',
-            'model' => 'Adminpanel::Category',
+            'options' => Proc.new {|object|
+              Adminpanel::Category.all {|o| [o.id, o.name] }
+            }
           }
         },
 

data/test/dummy/app/models/adminpanel/mug.rb

@@ -36,7 +36,7 @@ module Adminpanel
     # end
 
     def self.routes_options
-      { except:[:new, :create, :edit, :update, :destroy, :show], path:'tazas'}
+      { except: [:new, :create, :edit, :update, :destroy, :show], path:'tazas'}
     end
   end
 end

data/test/dummy/app/models/adminpanel/product.rb

@@ -3,6 +3,7 @@ module Adminpanel
     include Adminpanel::Base
     include Adminpanel::Facebook
     include Adminpanel::Twitter
+    include Adminpanel::Friendly
 
     has_many :categorizations
     has_many :categories, through: :categorizations
@@ -12,9 +13,21 @@ module Adminpanel
     validates_presence_of :price
     validates_presence_of :description
 
+    def supername
+      "Super#{name}"
+    end
+
     def self.form_attributes
       [
-      {"category_ids" => {"type" => "has_many", "model" => "Adminpanel::Category", "name" => "category_ids"}},
+      {
+        "category_ids" => {
+          "type" => "checkbox",
+          "options" => Proc.new {|object|
+            Adminpanel::Category.all
+          }
+        }
+      },
+
       {
         'name' => {
           'type' => 'text_field',
@@ -24,7 +37,6 @@ module Adminpanel
       {
         'price' => {
           'type' => 'text_field',
-          'name' => 'price'
         }
       },
       {

data/test/dummy/app/models/adminpanel/salesman.rb

@@ -8,21 +8,22 @@ module Adminpanel
 
     def self.form_attributes
       [
-      {
-        'name' => {
-          'type' => 'text_field',
-          'label' => 'name',
-          'placeholder' => 'name'
-        }
-      },
-      {
-        'product_id' => {
-          'type' => 'belongs_to',
-          'model' => 'Adminpanel::Product',
-          'label' => 'product',
-          'placeholder' => 'product'
-        }
-      },
+        {
+          'name' => {
+            'type' => 'text_field',
+            'label' => 'name',
+            'placeholder' => 'name'
+          }
+        },
+        {
+          'product_id' => {
+            'type' => 'select',
+            'label' => 'product_id',
+            'options' => Proc.new { |object|
+              Adminpanel::Product.all.map {|o| [o.id, o.supername]}
+            }
+          }
+        },
       ]
     end