redmine_crm 0.0.46 → 0.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec79f1544566d58c025b791d7ef86d9bf78ab73
-  data.tar.gz: be352f660d38fddc5818d92e22ae06fda8244448
+  metadata.gz: 69a1fa898e3b5a087d2dd75ad7ef6fe39e28cdde
+  data.tar.gz: 26dbba848e8586993dfc82a0f6f84f446c81699a
 SHA512:
-  metadata.gz: e9bb7dbcbde4808ca94707defdfac09c6e2a7d5eadd64b57f198f5d8991e95b1ef0562e588341bebb356ba1abfce848cc201ca912e8c930909a74b5029153515
-  data.tar.gz: 1db307a3ccf82eb9b7fc6de0efbb33c6093f14b9ee606ddab87bf4a02ce48e06b693b0f0a450f2ca58968bde397c5d6a3c801d9554e29fc792dcf3d9240c2a2a
+  metadata.gz: 29c1d4c2f6b61cd04a6842bae649b85ef9785ab52cd197bfdca70033c21e0b77a413392fefe05436edffea8386be6ba19c50c16bb43d451cc4e7407e6abff70c
+  data.tar.gz: 9bcfba949514d1a2bcc9abc5f6aa6f6be012c74d3abab92a287297869cc14655f65effe73d252f2b38954616f22dc844622b50670f3c9a829ab129dd0559b6cc

data/doc/CHANGELOG

@@ -4,6 +4,10 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2019 RedmineUP
 https://www.redmineup.com/
  
+== 2019-08-26 v0.0.47
+
+* Fixed bug with tag cloud 
+
 == 2019-08-14 v0.0.46
 
 * select2 update

data/lib/redmine_crm/acts_as_taggable/rcrm_acts_as_taggable.rb

@@ -111,8 +111,14 @@ module RedmineCrm
           group_fields << ", #{Tag.table_name}.created_at" if Tag.respond_to?(:created_at)
           group_fields << ", #{Tag.table_name}.updated_at" if Tag.respond_to?(:updated_at)
 
+          if base_class.respond_to?(:visible_condition)
+            visible_condition = base_class.visible_condition(User.current)
+            if visible_condition.include?('project_id') && join.all? { |jn| jn.exclude?('JOIN projects') }
+              join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
+            end
+            scope = scope.where(visible_condition)
+          end
           scope = scope.joins(join.join(' '))
-          scope = scope.where(base_class.visible_condition(User.current)) if base_class.respond_to?(:visible_condition)
           scope = scope.select("#{Tag.table_name}.*, COUNT(DISTINCT #{Tagging.table_name}.taggable_id) AS count")
           scope = scope.group("#{Tag.table_name}.id, #{Tag.table_name}.name #{group_fields}")
           scope = scope.having('COUNT(*) > 0')

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.46'
+  VERSION = '0.0.47'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails