redmine_crm 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b37a6a71a78445ab8bd0a7943289f7d2de66266
-  data.tar.gz: 7314f12328b7d335d16ab0b188ea97805c17b420
+  metadata.gz: 98f6edf8cd9c627f119640dc72c109b501716c0e
+  data.tar.gz: a361e4228e0087d21df1a61a1eade63e4d470c91
 SHA512:
-  metadata.gz: 5acbbd27b7da55822a2ccd98894623b8c940ae2ce97937b1d5739e37c17a21ac0767a04b055a83ed5b63578e2a24d519bab5e34a35c7d66d6fb82a8e94db22ae
-  data.tar.gz: 5c60eb6ba7e3f5994780dba765274d004e4e37d87322e95fef54d5b1ce2cc00ff1b82c638cc7f2f616ac9f75bb4586f53b36f76e5172a6150e5d01fe17ae42de
+  metadata.gz: 16c88a5ab553ce3a01d141be49929b402f7e4f4d252c7dc9b0c476d5b1d6e9f51ab5773728a4d47c4f0fcd229829ae22e96e280f45f19b9cb6b124f013925fc4
+  data.tar.gz: 49ce508bdf8fa137cd395c6f46c726cd9760561b311e33c948ad65ac0775150262488584a7b2abbdbb49002786369cc4230aaa40abf35e47045537e82be21996

data/.gitignore

@@ -3,7 +3,6 @@
 /Gemfile.lock
 /_yardoc/
 /coverage/
-/doc/
 /pkg/
 /spec/reports/
 /tmp/

data/README.md

@@ -8,7 +8,7 @@ Gem include next functional for Redmine plugins:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "redmine_crm", :git => "git@bitbucket.org:redminecrm/redmine_crm.git"
+gem "redmine_crm"
 ```
 
 And then execute:
@@ -24,9 +24,7 @@ Create migration with next code:
   require 'redmine_crm/rcrm_acts_as_taggable'
 
   def self.up
-    # unless table_exists?(:viewings)
-      ActiveRecord::Base.create_taggable_table
-    # end
+    ActiveRecord::Base.create_taggable_table
   end
 
   def self.down    

data/doc/CHANGELOG

@@ -0,0 +1,11 @@
+== Redmine CRM gem changelog
+
+Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
+Copyright (C) 2011-2015 RedmineCRM
+http://www.redminecrm.com/
+
+== 2015-09-23 v0.0.14
+
+* Fixed bug in viewed? function
+* Add check for existing columns in table for votes
+* Fixed bug with thousands delimiter

data/lib/redmine_crm/currency/formatting.rb

@@ -26,7 +26,7 @@ module RedmineCrm
         alias_method name, method
       end
 
-     
+
       def format(value, currency, *rules)
         # support for old format parameters
         rules = normalize_formatting_rules(rules)
@@ -35,10 +35,10 @@ module RedmineCrm
         if currency
           rules = self.localize_formatting_rules(rules, currency)
           rules = self.translate_formatting_rules(rules, currency.code) if rules[:translate]
-          rules[:decimal_mark] = currency.decimal_mark
+          rules[:decimal_mark] = currency.decimal_mark unless rules[:decimal_mark]
           rules[:decimal_places] = currency.decimal_places
           rules[:subunit_to_unit] = currency.subunit_to_unit
-          rules[:thousands_separator] = currency.thousands_separator
+          rules[:thousands_separator] = currency.thousands_separator unless rules[:thousands_separator]
         end
 
         # if fractional == 0
@@ -58,13 +58,13 @@ module RedmineCrm
 
         # if rules[:rounded_infinite_precision]
         if currency
-          formatted.gsub!(/#{currency.decimal_mark}/, '.') unless '.' == currency.decimal_mark
+          formatted.gsub!(/#{rules[:decimal_mark]}/, '.') unless '.' == rules[:decimal_mark]
           formatted = ((BigDecimal(formatted) * currency.subunit_to_unit).round / BigDecimal(currency.subunit_to_unit.to_s)).to_s("F")
           formatted.gsub!(/\..*/) do |decimal_part|
             decimal_part << '0' while decimal_part.length < (currency.decimal_places + 1)
             decimal_part
           end
-          formatted.gsub!(/\./, currency.decimal_mark) unless '.' == currency.decimal_mark
+          formatted.gsub!(/\./, rules[:decimal_mark]) unless '.' == rules[:decimal_mark]
         end
 
         sign = value < 0 ? '-' : ''
@@ -206,12 +206,8 @@ module RedmineCrm
           rules = rules.pop
           rules = { rules => true } if rules.is_a?(Symbol)
         end
-        if !rules.include?(:decimal_mark) && rules.include?(:separator)
-          rules[:decimal_mark] = rules[:separator]
-        end
-        if !rules.include?(:thousands_separator) && rules.include?(:delimiter)
-          rules[:thousands_separator] = rules[:delimiter]
-        end
+        rules[:decimal_mark] = rules[:separator] || ContactsSetting.decimal_separator || rules[:decimal_mark]
+        rules[:thousands_separator] = rules[:delimiter] || ContactsSetting.thousands_delimiter || rules[:thousands_separator]
         rules
       end
 
@@ -232,4 +228,4 @@ module RedmineCrm
     end
 
   end
-end
+end

data/lib/redmine_crm/rcrm_acts_as_taggable.rb

@@ -89,6 +89,33 @@ module RedmineCrm
       end
       
       module SingletonMethods
+        #Return all avalible tags for a project or global
+        #Example: Question.available_tags(@project_id )
+        def available_tags(project=nil, limit=30)
+          scope = Tag.where({})
+          scope = scope.where("#{Project.table_name}.id = ?", project) if project
+          class_name = quote_value(base_class.name, nil)
+          join = []
+          join << "JOIN #{Tagging.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id "
+          join << "JOIN #{table_name} ON #{table_name}.id = #{Tagging.table_name}.taggable_id 
+            AND #{Tagging.table_name}.taggable_type = #{class_name} "
+          if project
+              join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
+          else
+              scope = scope.where("#{table_name}.project_id IS NULL")
+          end
+
+          group_fields = ""
+          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)
+
+          scope = scope.joins(join.join(' '))
+          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} HAVING COUNT(*) > 0")
+          scope = scope.order("#{Tag.table_name}.name")
+          scope = scope.limit(limit) if limit
+          scope
+        end
         # Returns an array of related tags.
         # Related tags are all the other tags that are found on the models tagged with the provided tags.
         # 

data/lib/redmine_crm/rcrm_acts_as_viewed.rb

@@ -132,7 +132,7 @@ module RedmineCrm
           # Is this object viewed already?
           def viewed?
             return (!self.views.nil? && self.views > 0) if attributes.has_key? 'views'
-            !viewings.find(:first).nil?
+            !viewings.first.nil?
           end
 
           # Get the number of viewings for this object based on the views field,

data/lib/redmine_crm/rcrm_acts_as_votable.rb

@@ -20,8 +20,14 @@ module RedmineCrm
 
       end
 
+      def create_index(table_name, column_name)
+        return if self.connection.index_exists?(table_name, column_name)
+        
+        self.connection.add_index table_name, column_name
+      end
+
       def create_votable_table options = {}
-        votes_name_table      = options[:votes] || :votes
+        votes_name_table = options[:votes] || :votes
           
         if !self.connection.table_exists?(votes_name_table)
           self.connection.create_table(votes_name_table) do |t|
@@ -32,22 +38,33 @@ module RedmineCrm
             t.column :vote_scope, :string
             t.column :vote_weight, :integer
 
-            # t.boolean :vote_flag
-            # t.string :vote_scope
-            # t.integer :vote_weight
-
             t.timestamps
           end
-          # byebug
-          # if ActiveRecord::VERSION::MAJOR < 4
-          if self.parent::VERSION::MAJOR < 4
-            self.connection.add_index :votes, [:votable_id, :votable_type]
-            self.connection.add_index :votes, [:voter_id, :voter_type]
+        else #if table exists - check existence of separate columns
+          fields = {
+            :votable_id => :integer,
+            :votable_type => :string,
+            :voter_id => :integer,
+            :voter_type => :string,
+            :vote_flag => :boolean,
+            :vote_scope => :string,
+            :vote_weight => :integer
+          }
+          fields.each do |name, type|
+            if !self.connection.column_exists?(votes_name_table, name)
+              self.connection.add_column(votes_name_table, name, type)
+            end
           end
 
-          self.connection.add_index :votes, [:voter_id, :voter_type, :vote_scope]
-          self.connection.add_index :votes, [:votable_id, :votable_type, :vote_scope]
         end
+
+        if self.parent::VERSION::MAJOR < 4
+          create_index votes_name_table, [:votable_id, :votable_type]
+          create_index votes_name_table, [:voter_id, :voter_type]
+        end
+
+        create_index votes_name_table, [:voter_id, :voter_type, :vote_scope]
+        create_index votes_name_table, [:votable_id, :votable_type, :vote_scope]
       end
 
       def drop_votable_table options = {}

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - RedmineCRM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies: []
 description: plugins for Redmine
 email:
@@ -19,10 +19,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE.txt
 - README.md
 - Rakefile
 - config/currency_iso.json
+- doc/CHANGELOG
+- doc/LICENSE.txt
 - lib/generators/redmine_crm_migration/redmine_crm_migration_generator.rb
 - lib/generators/redmine_crm_migration/templates/migration.rb
 - lib/redmine_crm.rb