redmine_crm 0.0.41 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 937d5d243e43f7d09a1d11db2a8fb5b7201484dc
-  data.tar.gz: fc0ed270797f455ebaddbc14f6ea74d1d56eb43f
+  metadata.gz: c7ec4763f7c0ff9e5ce0744bcd8579020ed89b32
+  data.tar.gz: 45d4f87a91b17c299097c1f6aa5a9732507f30cc
 SHA512:
-  metadata.gz: 77fc48be16fbba575c32f035af43aa4d0ec3e595f29b30364b62c3565dc4c600f5d809b839c62a779a5cb2cfa577f496205ebb2bb3d49bbc4ee06f4b72dd6c45
-  data.tar.gz: f45297ba257bd057cb6ad5073998fcd58bf3f99048a364b6d78967846d03c9d04d47af85407209b3df976168c706dc20fa2b8bd8c6146e679dfaf82154a54b62
+  metadata.gz: a604d13c92a5a5e47ff93d7aeb3867c503c1743beb55059502cbc4fd28a2ddadac9e6cc7745e950249aace899dab2ed8e86d7ced27d5682bd2aade9f7c6e6ca3
+  data.tar.gz: d26992ff800bf72702248dd3d3afb416ee15a5432091ed38befa56196a436b75901fc04a328dc742450261d1e59dba55552e33c8a32e985e6834fada408c79dc

data/bitbucket-pipelines.yml

@@ -3,12 +3,15 @@
 # Only use spaces to indent your .yml configuration.
 # -----
 # You can specify a custom docker image from Docker Hub as your build environment.
-image: ruby:2.3.0
 
 pipelines:
   default:
     - step:
+        name: New ruby
+        image: ruby:2.4.1
         script:
+          - sed -i "s/'sqlite3'/'sqlite3', '~> 1.3.6'/g" redmine_crm.gemspec
+          - sed -i "s/'mysql2'/'mysql2', '~> 0.4.0'/g" redmine_crm.gemspec
           - bundle install
           - bundle exec rake test DB=sqlite
           - bundle exec rake test DB=postgresql
@@ -16,6 +19,14 @@ pipelines:
         services:
           - mysql
           - postgres
+    - step:
+        name: Old ruby
+        image: ruby:1.9.3
+        script:
+          - bundle install
+          - bundle exec rake test DB=mysql
+        services:
+          - mysql
 
 definitions:
   services:

data/doc/CHANGELOG

@@ -1,8 +1,26 @@
 == Redmine CRM gem changelog
 
 Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
-Copyright (C) 2011-2018 RedmineUP
+Copyright (C) 2011-2019 RedmineUP
 https://www.redmineup.com/
+ 
+== 2019-05-07 v0.0.43
+
+* custom_field and custom_fields methods added from Reporter plugin
+* Added support for multi email contacts select
+* Fixed Safari select2 bug with moving screen
+* Fixed after_action method compatibility
+
+== 2018-10-24 v0.0.42
+
+* Hotfix for ruby 1.9.3 hashes support
+* Added ci image for ruby 1.9.3
+
+== 2018-10-23 v0.0.41
+
+* New fields for IssueDrop: tags, checklists, story_points, color, day_in_state
+* New Liquid filters for managing colors: darken_color, lighten_color, contrasting_text_color, hex_color, convert_to_brightness_value
+* Fixes for Drops to use nil delegates
 
 == 2018-09-28 v0.0.40
 

data/lib/redmine_crm/acts_as_draftable/rcrm_acts_as_draftable.rb

@@ -125,6 +125,7 @@ module RedmineCrm
       end
 
       def dump_to_draft
+        instance_values.default = nil
         Marshal.dump(instance_values)
       end
 

data/lib/redmine_crm/compatibility/application_controller_patch.rb

@@ -13,6 +13,10 @@ module RedmineCrm
           before_filter(*filters, &block)
         end
 
+        def after_action(*filters, &block)
+          after_filter(*filters, &block)
+        end
+
         def skip_before_action(*filters, &block)
           skip_before_filter(*filters, &block)
         end

data/lib/redmine_crm/liquid/drops/issues_drop.rb

@@ -132,7 +132,7 @@ module RedmineCrm
       end
 
       def checklists
-        @issue.respond_to?(:checklists) && @issue.checklists.map{|item| {"id_done": item.is_done, "subject": item.subject}}
+        @issue.respond_to?(:checklists) && @issue.checklists.map{|item| {"id_done" => item.is_done, "subject" => item.subject}}
       end
 
       def custom_field_values

data/lib/redmine_crm/liquid/filters/base.rb

@@ -98,8 +98,15 @@ module RedmineCrm
         end
 
         def custom_field(input, field_name)
-          if input.respond_to?(:custom_fields)
-            input.custom_fields[field_name]
+          if input.respond_to?(:custom_field_values)
+            custom_value = input.custom_field_values.detect { |cfv| cfv.custom_field.name == field_name }
+            custom_value.custom_field.format.formatted_custom_value(nil, custom_value)
+          end
+        end
+
+        def custom_fields(input)
+          if input.respond_to?(:custom_field_values)
+            input.custom_field_values.map { |cfv| cfv.custom_field.name }
           end
         end
 

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.41'
+  VERSION = '0.0.43'
 end

data/redmine_crm.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'liquid', '< 2.6.4'
 
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'mysql2', '~> 0.4.0'
+  spec.add_development_dependency 'mysql2'
   spec.add_development_dependency 'pg'
 end

data/test/test_helper.rb

@@ -14,7 +14,7 @@ class ActiveSupport::TestCase #:nodoc:
 
   self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
 
-  self.use_transactional_tests = true
+  self.use_transactional_tests = true if RUBY_VERSION > '1.9.3'
   self.use_instantiated_fixtures = false
   set_fixture_class :tags => RedmineCrm::ActsAsTaggable::Tag
   set_fixture_class :taggings => RedmineCrm::ActsAsTaggable::Tagging

data/vendor/assets/javascripts/select2_helpers.js

@@ -95,18 +95,36 @@ function formatStateWithAvatar(opt) {
   return $('<span>' + opt.avatar + '&nbsp;' + opt.text + '</span>');
 };
 
+function formatStateWithMultiaddress(opt) {
+  return $('<span class="select2-contact">' + opt.avatar + '<p class="select2-contact__name">' + opt.text + '</p><p class="select2-contact__email">' + opt.email + '</p></span>');
+}
+
 
 function transformToSelect2(field, options) {
   if (rowHasSelect2(field)) { return }
 
   findInRowBy(field, '.toggle-multiselect').hide();
-  findSelectTagInRowBy(field).select2(buildSelect2Options(options));
+  var selectField = findSelectTagInRowBy(field);
+  selectField.select2(buildSelect2Options(options));
+
+  var select2Instance = selectField.data('select2');
+  select2Instance.on('results:message', function(params){
+    this.dropdown._resizeDropdown();
+    this.dropdown._positionDropdown();
+  });
 };
 
 
 function select2Tag(id, options) {
   $(function () {
-    $('select#' + id).select2(buildSelect2Options(options));
+    var selectField = $('select#' + id);
+    selectField.select2(buildSelect2Options(options));
+
+    var select2Instance = selectField.data('select2');
+    select2Instance.on('results:message', function(params){
+      this.dropdown._resizeDropdown();
+      this.dropdown._positionDropdown();
+    });
   });
 };
 

data/vendor/assets/stylesheets/select2.css

@@ -355,6 +355,7 @@
   border: 0px !important;
   height: inherit !important;
   padding: 0px !important;
+  width: 2em !important;
 }
 
 .filter .select2-container--default .select2-selection--multiple .select2-selection__choice {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.43
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,16 +56,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement