adminpanel 2.6.1 → 3.0.0

data/app/assets/stylesheets/adminpanel/theme.css.scss.erb

@@ -767,7 +767,7 @@ table.table thead .sorting_desc_disabled { background: url(<%= asset_path 'admin
     margin:0 10px;
 }
 .widget{
-    /*margin-bottom: 15px;   */
+    margin-bottom: 15px;
     -moz-border-radius: 3px 3px 3px 3px;
     -webkit-border-radius: 3px 3px 3px 3px;
     border-radius: 3px 3px 3px 3px;

data/app/controllers/adminpanel/analytics_controller.rb

@@ -4,7 +4,8 @@ module Adminpanel
     include Adminpanel::Analytics::InstagramAnalytics
 
     skip_before_action :set_resource_collection
-    before_action :check_if_fb_account, only:[:fb]
+
+    before_action :set_fb_token
 
     API_VERSION = 'v3'
     CACHED_API_FILE = "#{Rails.root}/tmp/cache/analytics-#{API_VERSION}.cache"
@@ -81,50 +82,6 @@ module Adminpanel
       end
     end
 
-    def fb
-      authorize! :read, Adminpanel::Analytic
-      if params[:insight].present?
-        period = params[:insight]
-      else
-        period = 'day' #default period
-      end
-      page_graph = Koala::Facebook::API.new(@auth.value)
-      @impressions,
-      @impressions_unique,
-
-      @new_likes,
-      @total_likes,
-
-      @hidden,
-      @hidden_unique,
-
-      @consumptions,
-      @consumptions_unique,
-
-      @views,
-      @views_unique,
-
-      @stories = page_graph.batch do |api|
-        #all information on same request
-        api.get_connections('me', 'insights', metric: 'page_impressions', period: period) #eye
-        api.get_connections('me', 'insights', metric: 'page_impressions_unique', period: period) #eye
-
-        api.get_connections('me', 'insights', metric: 'page_fan_adds') #fb-thumb
-        api.get_connections('me', 'insights', metric: 'page_fans') #fb-thumb
-
-        api.get_connections('me', 'insights', metric: 'page_negative_feedback', period: period)
-        api.get_connections('me', 'insights', metric: 'page_negative_feedback_unique', period: period)
-
-        api.get_connections('me', 'insights', metric: 'page_consumptions', period: period)
-        api.get_connections('me', 'insights', metric: 'page_consumptions_unique', period: period)
-
-        api.get_connections('me', 'insights', metric: 'page_views')
-        api.get_connections('me', 'insights', metric: 'page_views_unique')
-
-        api.get_connections('me', 'insights', metric: 'page_stories', period: period)
-      end
-    end
-
     # uses @client to fetch replies and tweets, for some statics
     def twitter
       authorize! :read, Adminpanel::Analytic
@@ -153,12 +110,11 @@ module Adminpanel
       end
     end
 
-  private
-    def check_if_fb_account
-      @auth = Adminpanel::Auth.find_by_key('facebook')
-      if @auth.nil? || @auth.value == ''
-        redirect_to analytics_path
+    private
+
+      def set_fb_token
+        @fb_auth = Adminpanel::Auth.find_by_key('facebook')
       end
-    end
+
   end
 end

data/app/controllers/adminpanel/application_controller.rb

@@ -13,6 +13,7 @@ module Adminpanel
     include Adminpanel::FacebookActions
     include Adminpanel::TwitterActions
     include Adminpanel::SitemapActions
+    include Adminpanel::GalleryActions
 
   private
     rescue_from CanCan::AccessDenied do |exception|

data/app/controllers/adminpanel/roles_controller.rb

@@ -3,7 +3,10 @@ module Adminpanel
 
     private
     def role_params
-      params.require(:role).permit(:name, {permission_ids: []})
+      params.require(:role).permit(
+        :name,
+        { permission_ids: [] }
+      )
 
     end
   end

data/app/controllers/adminpanel/sections_controller.rb

@@ -28,13 +28,7 @@ module Adminpanel
         :name,
         :max_files,
         :has_image,
-        {
-          sectionfiles_attributes: [
-            :id,
-            :file,
-            :_destroy
-          ]
-        }
+        sectionfile_ids: []
       )
     end
   end

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

@@ -56,6 +56,7 @@ module Adminpanel
       @fb_auths_count ||= Auth.find_by_key('facebook')
     end
 
+    # Creates or updates the Facebook Auth token.
     def update_fb_auth(account_selected_name)
       auth = Auth.find_by(key: 'facebook', name: account_selected_name)
       if auth.nil?
@@ -70,6 +71,8 @@ module Adminpanel
       end
     end
 
+    # Extracts the name of the model
+    # @return Name of the model [String]
     def model_name
       @model.name.demodulize.downcase # ex: posts
     end

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

@@ -0,0 +1,31 @@
+module Adminpanel
+  module GalleryActions
+    extend ActiveSupport::Concern
+
+    def add_to_gallery
+      image_class = params[:model].constantize
+      image = image_class.new(file: params[:file], model_type: params[:parent_object_class])
+      image.model_id = params[:resource_id] if params[:resource_id]
+
+      if image.save
+        response = {
+          class: image_class.to_controller_name,
+          id: image.id
+        }
+
+        respond_to do |f|
+          f.json{ render status: :ok, json: response.to_json }
+        end
+      end
+    end
+
+    def remove_image
+      @image = params[:model].constantize.find(params[:id])
+      @image.destroy
+
+      respond_to do |f|
+        f.json{ render status: :ok, json: @image.to_json }
+      end
+    end
+  end
+end

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

@@ -72,7 +72,10 @@ module Adminpanel
 
     def destroy
       @resource_instance.destroy
-      redirect_to action: :index
+      respond_to do |format|
+        format.html { redirect_to action: :index }
+        format.js { render('adminpanel/templates/destroy') }
+      end
     end
 
     private

data/app/helpers/adminpanel/analytics_helper.rb

@@ -1,15 +1,5 @@
 module Adminpanel
   module AnalyticsHelper
-  def first_fb_value metric
-      total = 0.0
-      # metric.first['values'].each do |value|
-      #   if value['value'] != []
-      #     total = total + value['value'].to_f
-      #   end
-      # end
-      # return total
-      metric.first['values'].last['value'].to_f
-    end
 
     def days_to_substract
       if params[:insight] == 'day'
@@ -23,14 +13,6 @@ module Adminpanel
       end
     end
 
-    def divide_metrics metric_1, metric_2
-      if first_fb_value(metric_2) != 0.0
-        return first_fb_value(metric_1) / first_fb_value(metric_2)
-      else
-        return 0
-      end
-    end
-
     def insight
       return 'day' if !params[:insight].present?
       return 'day' if params[:insight] == 'day'
@@ -46,6 +28,14 @@ module Adminpanel
       "http://www.twitter.com/#{tweet.user.screen_name}/status/#{tweet.id}"
     end
 
+    def fb_insights(fb_auth)
+      if fb_auth
+        "#{Koala::Facebook::API.new(fb_auth.value).get_object('me')['link']}insights"
+      else
+        '#'
+      end
+    end
+
     def exist_instagram_account?
       if @instagram_token.nil?
         false

data/app/helpers/adminpanel/application_helper.rb

@@ -6,13 +6,21 @@ 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' }
+      if name.class.has_gallery?
+        options[:html][:"data-parent-object-class"] = name.class.to_s
+        options[:html][:"data-parent-object-id"] = name.id
+        options[:html][:"data-dropzone"] = name.class.to_s.demodulize.underscore
+        options[:html][:"data-dropzone-galleries"] = name.class.galleries.to_json
+        options[:html][:"data-dropzone-url"] = url_for(controller: name.class.to_controller_name, action: :add_to_gallery)
+        options[:html][:"data-dropzone-delete-url"] = url_for(controller: name.class.to_controller_name, action: :remove_image)
+      end
 
       form_for(name, *(args << options), &block)
     end
 
     def full_title(page_title)
-      base_title = t("Panel title")
+      base_title = I18n.t("panel-title")
       if page_title.empty?
         base_title
       else

data/app/helpers/adminpanel/router_helper.rb

@@ -4,8 +4,8 @@ module Adminpanel
       resource_class(resource).has_sortable_gallery?
     end
 
-    def sortable_gallery(resource)
-      resource_class(resource).gallery_relationship
+    def sortable_galleries(resource)
+      resource_class(resource).sortable_galleries
     end
 
     def resources_parameters(resource)
@@ -20,6 +20,10 @@ module Adminpanel
       resource_class(resource).twitter_share?
     end
 
+    def has_gallery?(resource)
+      resource_class(resource).has_gallery?
+    end
+
     def resource_is_sortable?(resource)
       resource_class(resource).is_sortable?
     end

data/app/helpers/adminpanel/shared_pages_helper.rb

@@ -14,7 +14,7 @@ module Adminpanel
     end
 
     def pluralize_model(class_name)
-      "#{demodulize_class(class_name).pluralize}"
+      demodulize_class(class_name).pluralize
     end
 
     def relationship_ids(class_string)
@@ -50,8 +50,8 @@ module Adminpanel
       ).url_for_oauth_code
     end
 
-    def field_value(properties, attribute, object)
-      case properties['type']
+    def field_value(attr_type, attribute, object)
+      case attr_type
       when 'select'
         belong_to_object_name(object, attribute.gsub('_id', ''))
       when 'checkbox'
@@ -65,6 +65,8 @@ module Adminpanel
           li_tags.html_safe
         end
       when 'file_field'
+        object[attribute]
+      when 'image_field'
         content_tag :ul do
           image_tag(object.send("#{attribute}_url", :thumb))
         end

data/app/models/adminpanel/analytic.rb

@@ -18,5 +18,9 @@ module Adminpanel
       "dashboard"
     end
 
+    def self.has_route?(path)
+      true
+    end
+
   end
 end

data/app/models/adminpanel/image.rb

@@ -0,0 +1,31 @@
+module Adminpanel
+  class Image < ActiveRecord::Base
+    include Adminpanel::Base
+
+    belongs_to :model, polymorphic: true
+
+    before_save :store_file_size_and_content_type
+    # after_save :delete_old_unused_images
+    before_destroy :remove_attachment
+
+    private
+      def remove_attachment
+        self.remove_file!
+      end
+
+      def store_file_size_and_content_type
+        if file.present? && file_changed?
+          self.content_type = file.file.content_type
+          self.file_size = file.file.size
+        end
+      end
+
+      # def delete_old_unused_images
+      #   self.class.where('created_at < ?', Time.now - 30.minutes)
+      #             .delete_all(
+      #               model_id: nil,
+      #               type: self.type
+      #             )
+      # end
+  end
+end

data/app/models/adminpanel/sectionfile.rb

@@ -1,9 +1,7 @@
 module Adminpanel
-  class Sectionfile < ActiveRecord::Base
+  class Sectionfile < Image
     include Adminpanel::Base
 
-    validates_presence_of :file
-
     mount_uploader :file, Adminpanel::SectionUploader
   end
 end

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

@@ -3,11 +3,15 @@ module Adminpanel
     extend ActiveSupport::Concern
 
     module ClassMethods
+    FILE_FIELD_NAME = 'adminpanel_file_field'
+
 
       # Adminpanel API
       def mount_images(relation)
-        has_many relation, dependent: :destroy
+        has_many relation, dependent: :destroy, as: :model
         accepts_nested_attributes_for relation, allow_destroy: true
+        after_save :destroy_unattached_images
+        after_save :correlative_order_gallery, if: Proc.new { |model| model.class.has_sortable_gallery? }
       end
 
       # implementing cache by default.
@@ -61,7 +65,7 @@ module Adminpanel
               properties['show'] == 'true' ||
               (
                 properties['show'] == type &&
-                properties['type'] != 'adminpanel_file_field' #file fields get only displayed in form
+                properties['type'] != FILE_FIELD_NAME #file fields get only displayed in form
               )
             )
               display_attributes << attribute
@@ -76,7 +80,7 @@ module Adminpanel
       def has_gallery?
         form_attributes.each do |fields|
           fields.each do |attribute, properties|
-            if properties['type'] == 'adminpanel_file_field'
+            if properties['type'] == FILE_FIELD_NAME
               return true
             end
           end
@@ -84,12 +88,39 @@ module Adminpanel
         return false
       end
 
+      #Returns an array of all the adminpanel_field_field fields found in form_attributes
+      def galleries
+        galleries = {}
+        form_attributes.each do |fields|
+          fields.each do |attribute, properties|
+            if properties['type'] == FILE_FIELD_NAME
+              galleries["#{attribute.singularize}"] = "adminpanel/#{attribute}".classify.constantize.to_s
+            end
+          end
+        end
+
+        return galleries
+      end
+
+      def sortable_galleries
+        galleries = {}
+        form_attributes.each do |fields|
+          fields.each do |attribute, properties|
+            if properties['type'] == FILE_FIELD_NAME && "adminpanel/#{attribute}".classify.constantize.is_sortable?
+              galleries["#{attribute.singularize}"] = "adminpanel/#{attribute}".classify.constantize.to_s
+            end
+          end
+        end
+
+        galleries
+      end
+
       # 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'
+            if properties['type'] == FILE_FIELD_NAME
               return attribute
             end
           end
@@ -152,9 +183,11 @@ module Adminpanel
       end
 
       def has_sortable_gallery?
-        if has_gallery?
-          gallery_class.is_sortable?
-        end
+        !sortable_galleries.empty?
+      end
+
+      def to_controller_name
+        to_s.demodulize.underscore.pluralize
       end
 
       private
@@ -176,6 +209,17 @@ module Adminpanel
           false
         end
       end
+
+    end
+
+    def destroy_unattached_images
+      self.class.galleries.each{|gallery| gallery.last.constantize.delete_all(model_id: nil) }
+    end
+
+    def correlative_order_gallery
+      self.class.galleries.each do |gallery|
+        self.send(gallery.first.pluralize).ordered.each_with_index{ |image, index| image.update(position: index + 1) }
+      end
     end
   end
 end