adminpanel 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1507bc64df02e756c6142e0222e98ebe33b1bf09
-  data.tar.gz: 32e379878e099ac52116affe5515589d39f83e91
+  metadata.gz: ff642c29ef845dc25a183c0938386388fafc86ec
+  data.tar.gz: 37f3f7faaff4083b1d4c0d419f0169542bfbac5a
 SHA512:
-  metadata.gz: 621fed57774947e6ab5aefbde93243d572bde6bb5fc26112e4c75ef0ca37a1e33ca7098ed5990e27c26d9d47f160f9f0437fb4d2871ba6514cb7a87b923d4dd1
-  data.tar.gz: e71a1faf210481f8c792ffbf137ca4d70d6481119d6911b9f9f4b93f31c41998cbcb20ebcff0404c989c62e114835a003aef8becd8c173ca91cce3a1296f90c4
+  metadata.gz: 3565fd437af3f63447c81ecc50634003fddd70ce04c62d2e0745adcba165006fa0348ccd00b572f2df0b95cab482a13cf8a4e82192336a4f19d1eb14d3ba0b61
+  data.tar.gz: e6cb9fd9a770e247a1764b3eb8ec9337b2238d9831305cfe90fa6427c00c41c4033398d316a3a1fab7a5326548332c8b604a4e12ea25b41bdcc4254f90b53303

data/app/assets/javascripts/adminpanel/google_analytics_chart.js.coffee

@@ -17,8 +17,8 @@ drawGraphic = ->
       .range [0, width]
 
     y = d3.scale.linear()
-      .domain d3.extent data, (d) -> d.visits
-      .range [height, 0]
+      .domain(d3.extent(data, (d) -> +d.visits))
+      .range([height, 0])
 
     xAxis = d3.svg.axis()
       .scale x

data/app/controllers/adminpanel/analytics_controller.rb

@@ -4,6 +4,7 @@ module Adminpanel
     include Adminpanel::Analytics::InstagramAnalytics
 
     skip_before_filter :set_model
+    before_action :check_if_fb_account, only:[:fb]
 
     API_VERSION = 'v3'
     CACHED_API_FILE = "#{Rails.root}/tmp/cache/analytics-#{API_VERSION}.cache"
@@ -82,14 +83,12 @@ module Adminpanel
 
     def fb
       authorize! :read, Adminpanel::Analytic
-      auth = Adminpanel::Auth.find_by_key('facebook')
-      redirect_via_turbolinks_to analytics_path if !auth.nil? && auth.value != '' # not nil & not void
       if params[:insight].present?
         period = params[:insight]
       else
         period = 'day' #default period
       end
-      page_graph = Koala::Facebook::API.new(auth.value)
+      page_graph = Koala::Facebook::API.new(@auth.value)
       @impressions,
       @impressions_unique,
 
@@ -153,5 +152,13 @@ module Adminpanel
         @user = @instagram_client.user
       end
     end
+
+  private
+    def check_if_fb_account
+      @auth = Adminpanel::Auth.find_by_key('facebook')
+      if @auth.nil? || auth.value == ''
+        redirect_to analytics_path
+      end
+    end
   end
 end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/lib/generators/adminpanel/resource/templates/adminpanel_resource_template.rb

@@ -17,7 +17,7 @@ module Adminpanel
     end
 
     # def self.icon
-    #   "truck" # fa-{icon}
+    #   'truck' # fa-{icon}
     # end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Jose Ramon Camacho