adminpanel 2.4.3 → 2.5.0

data/app/helpers/adminpanel/shared_pages_helper.rb

@@ -92,7 +92,7 @@ module Adminpanel
 
     def table_type(model)
       if model.is_sortable?
-        ''
+        'sortable'
       else
         'information-table'
       end

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

@@ -4,6 +4,8 @@ module Adminpanel
 
     # static(class) methods
     module ClassMethods
+
+      # API methods
       def mount_images(relation)
         has_many relation, dependent: :destroy
         accepts_nested_attributes_for relation, allow_destroy: true
@@ -14,6 +16,8 @@ module Adminpanel
         super(name, scope, options.reverse_merge!({touch: true}))
       end
 
+      # The fields and the types that should be used to generate form
+      # and display fields
       def form_attributes
         []
       end
@@ -24,6 +28,11 @@ module Adminpanel
         'please overwrite self.display_name'
       end
 
+      # side menu icon
+      def icon
+        'truck'
+      end
+
       # The word that is going to be shown in the side menu, routes and
       # breadcrumb.
       def collection_name
@@ -41,6 +50,9 @@ module Adminpanel
         return "field #{field} 'label' property not found :("
       end
 
+      # returns the attributes that should be shown in the correspondin view
+      # (some attributes may be filtered from the index table, from the show
+      # or even both)
       def display_attributes(type)
         display_attributes = []
         form_attributes.each do |attribute|
@@ -57,11 +69,12 @@ module Adminpanel
             end
           end
         end
-
         return display_attributes
       end
 
-      def has_images?
+      # return true if model has adminpanel_file_field in
+      # it's attributes
+      def has_gallery?
         form_attributes.each do |fields|
           fields.each do |attribute, properties|
             if properties['type'] == 'adminpanel_file_field'
@@ -72,7 +85,9 @@ module Adminpanel
         return false
       end
 
-      def get_image_relationship
+      # returns the attribute that should be namespaced to be the class
+      # ex: returns 'productfiles', so class is Adminpanel::Productfile
+      def gallery_relationship
         form_attributes.each do |fields|
           fields.each do |attribute, properties|
             if properties['type'] == 'adminpanel_file_field'
@@ -83,6 +98,16 @@ module Adminpanel
         return false
       end
 
+      # gets the class gallery and return it's class
+      def gallery_class
+        "adminpanel/#{gallery_relationship}".classify.constantize
+      end
+
+      # returns all the class of the attributes of a given type.
+      # Usage:
+      # To get all classes of all belongs_to attributes:
+      #   @model.relationships_of('belongs_to')
+      #   # => ['Adminpanel::Category', Adminpanel::ModelBelongTo]
       def relationships_of(type_property)
         classes_of_relation = []
         form_attributes.each do |fields|
@@ -95,14 +120,6 @@ module Adminpanel
         return classes_of_relation
       end
 
-      def icon
-        'truck'
-      end
-
-      def gallery_children
-        nil
-      end
-
       def routes_options
         { path: collection_name.parameterize }
       end
@@ -135,6 +152,12 @@ module Adminpanel
         false
       end
 
+      def has_sortable_gallery?
+        if has_gallery?
+          gallery_class.is_sortable?
+        end
+      end
+
       private
 
       def exclude?(route)

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

@@ -21,7 +21,6 @@ module Adminpanel
       logger.info Time.now
       ping_urls.each do |name, url|
         request = url % CGI.escape("#{root_url}/sitemap.xml")
-        logger.info root_url
         logger.info "  Pinging #{name} with #{request}"
         if !Rails.env.development?
           response = Net::HTTP.get_response(URI.parse(request))

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

@@ -6,58 +6,61 @@ module Adminpanel
     included do
       before_create :set_position
       before_destroy :rearrange_positions
-
-      default_scope do
-        order('position ASC')
-      end
     end
 
     module ClassMethods
       def is_sortable?
         true
       end
-    end
 
-    def move_to_better_position
-      if self.position > 1
-        conflicting_gallery(self.position - 1).increment!(:position)
-        self.decrement!(:position)
+      def ordered
+        order('position ASC')
+      end
 
-        true
-      else
-        false
+      def in_better_position(current_position, new_position)
+        where(
+          'position >= ? AND position < ?',
+          new_position,
+          current_position
+        )
+      end
+
+      def in_worst_position(current_position, new_position)
+        where(
+          'position > ? AND position <= ?',
+          current_position,
+          new_position
+        )
       end
     end
 
-    def move_to_worst_position
-      records = self.class.count
-      if self.position < records
-        conflicting_gallery(self.position + 1).decrement!(:position)
-        self.increment!(:position)
-        true
+    def move_to_position(new_position)
+      if new_position < position
+        # search for better elements and downgrade them
+        self.class.in_better_position(
+          self.position,
+          new_position
+        ).update_all('position = position + 1')
       else
-        false
+        # search for worster elements and upgrade them
+        self.class.in_worst_position(
+          self.position,
+          new_position
+        ).update_all('position = position - 1')
       end
+      self.update(position: new_position)
     end
 
     protected
-      def conflicting_gallery(conflicting_position)
-        logger.info "searching pos: #{conflicting_position}"
-        self.class.find_by_position(conflicting_position)
-      end
 
       def rearrange_positions
-        unarranged_records = self.class.where(
+        self.class.where(
           'position > ?', self.position
-        )
-        unarranged_records.each do |record|
-          record.update_attribute(:position, gallery.position - 1)
-        end
-
+        ).update_all('position = position - 1')
       end
 
       def set_position
-        last_record = self.class.last
+        last_record = self.class.ordered.last
         if last_record.nil?
           # this is the first record that is created
           self.position = 1

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

@@ -0,0 +1,90 @@
+module Adminpanel
+  module SortableGallery
+    extend ActiveSupport::Concern
+
+    included do
+      before_create :set_position
+      before_destroy :rearrange_positions
+
+      scope :ordered, -> { order('position ASC') }
+    end
+
+    module ClassMethods
+      def is_sortable?
+        true
+      end
+
+      def in_better_position(current_position, new_position, relation_id)
+        where(
+          'position >= ? AND position < ?',
+          new_position,
+          current_position
+        ).where(
+          relation_field => relation_id
+          # => 'product_id' => member.product_id
+        )
+      end
+
+      def in_worst_position(current_position, new_position, relation_id)
+        where(
+          'position > ? AND position <= ?',
+          current_position,
+          new_position
+        ).where(
+          relation_field => relation_id
+          # => 'product_id' => member.product_id
+        )
+      end
+    end
+
+    def move_to_position(new_position)
+      if new_position < position
+        # search for better elements and downgrade them
+        self.class.in_better_position(
+          self.position,
+          new_position,
+          self.send(self.class.relation_field)
+        ).update_all('position = position + 1')
+      else
+        # search for worster elements and upgrade them
+        self.class.in_worst_position(
+          self.position,
+          new_position,
+          self.send(self.class.relation_field)
+        ).update_all('position = position - 1')
+      end
+      self.update(position: new_position)
+    end
+
+    # we should detect if the name isn't defined in the class
+    def name
+      I18n.t('gallery.image')
+    end
+
+  protected
+
+    def rearrange_positions
+      self.class.where(
+        self.class.relation_field => self.send(
+          self.class.relation_field
+        )
+      ).where(
+        'position > ?',
+        self.position
+      ).update_all('position = position - 1')
+    end
+
+    def set_position
+      last_record = self.class.where(
+        self.class.relation_field => self.send(
+          self.class.relation_field
+        )
+      ).ordered.last
+      if last_record.nil?
+        self.position = 1
+      else
+        self.position = last_record.position + 1
+      end
+    end
+  end
+end

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

@@ -13,7 +13,7 @@
 
     <% if (
       properties['max-files'].to_i != 0 &&
-      properties['max-files'].to_i <= f.object.send(@model.get_image_relationship).count.to_i
+      properties['max-files'].to_i <= f.object.send(@model.gallery_relationship).count.to_i
     ) %>
       <% hidden = 'hidden' %>
     <% else %>

data/app/views/adminpanel/templates/index.html.erb

@@ -15,27 +15,55 @@
         <table id="<%= table_type(@model) %>" class="table table-striped table-bordered dataTable">
           <thead><!-- model attributes -->
             <tr>
+              <% if @model.is_sortable? %>
+                <th></th>
+              <% end %>
               <% @model.display_attributes('index').each do |fields| %>
                 <% fields.each do |attribute, properties| %>
                   <th><%= properties['label'] %></th>
                 <% end %>
               <% end %>
-              <% if @model.is_sortable? %>
-                <th>
-                  <%= I18n.t('position') %>
-                </th>
-              <% end %>
               <th><%= I18n.t('actions') %></th>
             </tr>
           </thead><!-- Ends model attributes -->
-          <% if @collection != [] %>
-            <% last_update = @collection.max_by(&:updated_at).updated_at %>
-          <% end %>
-          <% cache ["#{@model.name}-collection", last_update], skip_digest: true do %>
-            <tbody id="body-content">
-              <%= render 'adminpanel/shared/index_records', collection: @collection %>
-            </tbody>
-          <% end %><!-- end collection cache -->
+
+          <tbody id="<%= table_type(@model) %>">
+            <% @collection = @collection.ordered if table_type(@model) == 'sortable' %>
+            <% @collection.each do |member| %>
+              <% cache ["#{member.class}-member", member] do %>
+                <tr
+                  data-id="<%= member.id %>"
+                  <% if @model.is_sortable? %>
+                    data-url="<%= url_for [:move_to_position, member] %>"
+                  <% end %>
+                >
+                  <% if @model.is_sortable? %>
+                    <td class="draggable">
+                      <i class="fa fa-bars"></i>
+                    </td>
+                  <% end %>
+                  <% @model.display_attributes('index').each do |fields| %>
+                    <% fields.each do |attribute, properties| %>
+                    <td>
+                      <%= field_value(properties, attribute, member) %>
+                    </td>
+                    <% end %>
+                  <% end %>
+                  <td>
+                    <%= render 'adminpanel/icons/show',     resource: member %>
+
+                    <%= render 'adminpanel/icons/edit',     resource: member %>
+
+                    <%= render 'adminpanel/icons/delete',   resource: member %>
+
+                    <%= render 'adminpanel/icons/facebook', resource: member %>
+
+                    <%= render 'adminpanel/icons/twitter',  resource: member %>
+                  </td>
+                </tr>
+              <% end %>
+            <% end %>
+          </tbody>
         </table>
       </div>
     </div>

data/app/views/adminpanel/templates/show.html.erb

@@ -44,32 +44,52 @@
     </div>
   </div>
 
-  <% if @model.has_images? %>
+  <% if @model.has_gallery? %>
     <div class="widget widget-padding span6">
       <div class="widget-header">
         <%= content_tag(:i, nil, class: "fa fa-#{@model.icon}") %>
         <h5><%= I18n.t('gallery.container') %>: <%= @model.display_name.humanize %>
-          <%= render 'adminpanel/icons/edit',    resource: @resource_instance %>
+          <%= render 'adminpanel/icons/edit', resource: @resource_instance %>
         </h5>
       </div>
-      <% if @model.gallery_children %>
+      <% if @model.has_sortable_gallery? %>
         <div class="widget-body widget-tasks-assigned clearfix">
-          <ul id="gallery-entries">
-            <%= render(
-              'adminpanel/shared/gallery_entries',
-              images: @resource_instance.send(
-                @model.get_image_relationship
-              ).ordered
-            ) %>
-          </ul>
+          <table class="table table-striped table-bordered">
+            <thead>
+              <tr>
+                <td class="draggable-header"></td>
+                <td><i class="fa fa-picture-o"></i></td>
+              </tr>
+            </thead>
+            <tbody id="sortable">
+              <% collection = @resource_instance.send(@model.gallery_relationship).ordered %>
+              <% collection.each do |image| %>
+                <tr
+                  data-id="<%= image.id %>"
+                  data-url="<%= url_for [:move_to_position, image] %>"
+                >
+                  <td class="draggable img"><i class="fa fa-bars fa-2x"></i></td>
+                  <td>
+                    <%= link_to(
+                      image_tag(image.file_url(:thumb)),
+                      image.file.to_s,
+                      rel: "group",
+                      name: @model.display_name
+                    ) %>
+                  </td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
         </div>
       <% else %>
         <div class="widget-body row-fluid">
-          <% @resource_instance.send(@model.get_image_relationship).each do |image|%>
+          <% @resource_instance.send(@model.gallery_relationship).each do |image|%>
             <%= link_to(
               image_tag( image.file_url(:thumb) ),
               image.file_url.to_s,
-              rel: 'group', name: @model.display_name
+              rel: 'group',
+              name: @model.display_name
             ) %>
           <% end %>
         </div>