redmine_crm 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b0ba370b2cc56fc7a7573ba6e7fa65f63a739a9
-  data.tar.gz: 2e257839a165ba3ac9a35f1735d25721dd7ab4a6
+  metadata.gz: 5ade85cd3ada9dbdf2283e26488fc7a8ae0eeb93
+  data.tar.gz: 1c872961e53a3f1186ee4283cb08a15b264b3fe2
 SHA512:
-  metadata.gz: 8166cb752f502d9b172c30bf781ea30313f2a2fc5b2d37b9eb2a7585f8bd5e169509e6ceeee2703def216331ce00ad391ffc2ddf1571773dd0ba6adea658a45c
-  data.tar.gz: b2763d0e87a531654ce8fb73937becf3ddb1fb53a5702452c8ce83bcdfc7172a95a16e429e26192d8e2fff00cb97dd3ac8fdd95ec68c5752418090e7064e67ed
+  metadata.gz: 07c4211ffc5be1a3322a8eec1dc7ccfdaabe77b8edc8cade7a486b0a51852a728b78144c31c3f5c998c18ef11d954a24000f646f58f23bb98e57723dda3dca4d
+  data.tar.gz: 6527ee07dbcc1e52cd240e03c70dbf6ac00d32ef43b0af638940572896eb239e8cc7bb444927a74570845ca3501d474615a584fb126860fa52401499c9ef24bd

data/bitbucket-pipelines.yml

@@ -20,7 +20,7 @@ pipelines:
 definitions:
   services:
     mysql:
-      image: mysql
+      image: mysql:5.7
       environment:
         MYSQL_DATABASE: redmine_crm_test
         MYSQL_ROOT_PASSWORD: password

data/lib/redmine_crm.rb

@@ -32,6 +32,10 @@ require 'redmine_crm/helpers/external_assets_helper'
 require 'redmine_crm/helpers/form_tag_helper'
 require 'redmine_crm/assets_manager'
 
+module RedmineCrm
+  GEM_NAME = 'redmine_crm'.freeze
+end
+
 if defined?(ActiveRecord::Base)
   ActiveRecord::Base.send :include, RedmineCrm::ActsAsList::List
   ActiveRecord::Base.extend(RedmineCrm::ActsAsVotable::Voter)

data/lib/redmine_crm/acts_as_viewed/rcrm_acts_as_viewed.rb

@@ -87,8 +87,8 @@ module RedmineCrm
           unless Object.const_defined?(viewing_class)
             Object.class_eval <<-EOV
               class #{viewing_class} < ActiveRecord::Base
-                belongs_to :viewed, :polymorphic => true
-                belongs_to :viewer, :class_name => #{viewer_class}, :foreign_key => :viewer_id
+                belongs_to :viewed, polymorphic: true
+                belongs_to :viewer, class_name: '#{viewer_class}', foreign_key: :viewer_id
               end
             EOV
           end
@@ -114,7 +114,7 @@ module RedmineCrm
           viewer_as_class = viewer_class.constantize
           return if viewer_as_class.instance_methods.include?('find_in_viewings')
           viewer_as_class.class_eval <<-EOS
-            has_many :viewings, :foreign_key => :viewer_id, :class_name => #{viewing_class.to_s}
+            has_many :viewings, foreign_key: :viewer_id, class_name: '#{viewing_class.to_s}', dependent: :delete_all
           EOS
         end
       end

data/lib/redmine_crm/assets_manager.rb

@@ -1,9 +1,9 @@
 module RedmineCrm
   class AssetsManager
     def self.install_assets
-      return unless Gem.loaded_specs['redmine_crm']
-      source = File.join(Gem.loaded_specs['redmine_crm'].full_gem_path, 'vendor', 'assets')
-      destination = File.join(Dir.pwd, 'public', 'plugin_assets', 'redmine_crm')
+      return unless Gem.loaded_specs[GEM_NAME]
+      source = File.join(Gem.loaded_specs[GEM_NAME].full_gem_path, 'vendor', 'assets')
+      destination = File.join(Dir.pwd, 'public', 'plugin_assets', GEM_NAME)
       return unless File.directory?(source)
 
       source_files = Dir[source + '/**/*']

data/lib/redmine_crm/helpers/external_assets_helper.rb

@@ -5,13 +5,15 @@ module RedmineCrm
     def select2_assets
       return if @select2_tag_included
       @select2_tag_included = true
-      javascript_include_tag('select2', :plugin => 'redmine_crm') + stylesheet_link_tag('select2', :plugin => 'redmine_crm')
+      javascript_include_tag('select2', plugin: GEM_NAME) +
+        stylesheet_link_tag('select2', plugin: GEM_NAME) +
+        javascript_include_tag('select2_helpers', plugin: GEM_NAME)
     end
 
     def chartjs_assets
       return if @chartjs_tag_included
       @chartjs_tag_included = true
-      javascript_include_tag('Chart.bundle.min', :plugin => 'redmine_crm')
+      javascript_include_tag('Chart.bundle.min', plugin: GEM_NAME)
     end
   end
 end

data/lib/redmine_crm/helpers/form_tag_helper.rb

@@ -15,6 +15,10 @@ module RedmineCrm
     # * <tt>:data</tt> Load dropdown options from a local array if +url+ option not set.
     # * <tt>:placeholder</tt> Supports displaying a placeholder value.
     # * <tt>:include_hidden</tt> Adds hidden field after select when +multiple+ option true. Default value true.
+    # * <tt>:allow_clear</tt> Provides support for clearable selections. Default value false.
+    # * <tt>:min_input_length</tt> Minimum number of characters required to start a search. Default value 0.
+    # * <tt>:format_state</tt> Defines template of search results in the drop-down.
+    # * <tt>:tags</tt> Used to enable tagging feature.
     #
     # <b>Note:</b> The HTML specification says when +multiple+ parameter passed to select and all options got deselected
     # web browsers do not send any value to server.
@@ -22,102 +26,51 @@ module RedmineCrm
     # In case if you don't want the helper to generate this hidden field you can specify
     # <tt>include_hidden: false</tt> option.
     #
+    # <b>Note:</b> Select2 assets must be available on a page.
+    #   To include select2 assets to a page, you need to use the helper select2_assets.
+    #   For example:
+    #     <% content_for :header_tags do %>
+    #       <%= select2_assets %>
+    #     <% end %>
+    #
     # Also aliased as: select2
     #
     #   select2 'city_id', options_for_select(...)
     #
     def select2_tag(name, option_tags = nil, options = {})
-      id = sanitize_to_id(name)
-      placeholder = options[:placeholder] || 'Select ...'
+      s = select_tag(name, option_tags, options)
 
-      content_for(:header_tags) { select2_assets }
-      result = select_tag(name, option_tags, options)
       if options[:multiple] && options.fetch(:include_hidden, true)
-        result << hidden_field_tag("#{name}[]", '')
+        s << hidden_field_tag("#{name}[]", '')
       end
 
-      result << javascript_tag(<<-JS)
-        $(function () {
-            $('select#' + '#{id}').select2({
-                #{select2_data_source_options(options)},
-                #{select2_tags_options(options)},
-                placeholder: '#{placeholder}'
-            });
-        });
-      JS
+      s + javascript_tag("select2Tag('#{sanitize_to_id(name)}', #{options.to_json});")
     end
 
     alias select2 select2_tag
 
-    # Transforms select filter field into select2
+    # Transforms select filters of +type+ fields into select2
     #
     # ==== Examples
-    #   transform_to_select2 'issue_tags', url: auto_complete_tags_url
-    #   transform_to_select2 'manager_id', format_state: 'formatStateWithAvatar', min_input_length: 1, url: '/managers'
+    #   transform_to_select2 'tags', url: auto_complete_tags_url
+    #   transform_to_select2 'people', format_state: 'formatStateWithAvatar', min_input_length: 1, url: '/managers'
     #
     # ==== Options
     # * <tt>:url</tt> Defines URL to search remote data using the ajax.
     # * <tt>:format_state</tt> Defines template of search results in the drop-down.
     # * <tt>:min_input_length</tt> Minimum number of characters required to start a search. Default value 0.
     # * <tt>:width</tt> Sets the width of the control. Default value '60%'.
+    # * <tt>:multiple</tt> Supports multi-value select box. If set to false the selection will not allow multiple choices. Default value true.
     #
-    def transform_to_select2(field, options = {})
-      return if field.empty?
-
-      result = ''.html_safe
-      unless @transform_to_select2_included
-      result << javascript_include_tag('select2_helpers', plugin: 'redmine_crm')
-        @transform_to_select2_included = true
-      end
-
-      result << javascript_tag(<<-JS)
-          select2Filters['#{field}'] = {
-              url: '#{options[:url].to_s}',
-              formatState: #{options.fetch(:format_state, 'undefined')},
-              minimumInputLength: #{options.fetch(:min_input_length, 0)},
-              width: '#{options.fetch(:with, '60%')}'
-          };
-      JS
-    end
-
-    private
-
-    def select2_data_source_options(options = {})
-      if options[:url].to_s.empty?
-        "data: #{options.fetch(:data, []).to_json}"
-      else
-        "ajax: {
-             url: '#{options[:url]}',
-             dataType: 'json',
-             delay: 250,
-             data: function (params) {
-                 return { q: params.term };
-             },
-             processResults: function (data, params) {
-                 return { results: data };
-             },
-             cache: true
-         }"
-      end
-    end
-
-    def select2_tags_options(options = {})
-      if options.fetch(:tags, false)
-        "tags: true,
-         tokenSeparators: [','],
-         createTag: function (params) {
-             var term = $.trim(params.term);
-             if (term === '' || term.indexOf(',') > -1) {
-                 return null; // Return null to disable tag creation
-             }
-             return {
-                 id: term,
-                 text: term
-             }
-         }"
-      else
-        'tags: false'
-      end
+    # <b>Note:</b> Select2 assets must be available on a page.
+    #   To include select2 assets to a page, you need to use the helper select2_assets.
+    #   For example:
+    #     <% content_for :header_tags do %>
+    #       <%= select2_assets %>
+    #     <% end %>
+    #
+    def transform_to_select2(type, options = {})
+      javascript_tag("setSelect2Filter('#{type}', #{options.to_json});") unless type.empty?
     end
   end
 end

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.37"
+  VERSION = '0.0.38'
 end

data/vendor/assets/javascripts/select2_helpers.js

@@ -1,39 +1,168 @@
-var oldToggleFilter = window.toggleFilter;
+var SELECT2_DELAY = 250;
 
-window.toggleFilter = function (field) {
-    oldToggleFilter(field);
-    return transform_to_select2(field);
+var select2Filters = {};
+
+function setSelect2Filter(type, options) {
+  if (typeof operatorByType === 'undefined') { return }
+
+  operatorByType[type] = operatorByType[type] || operatorByType['list_optional'];
+  select2Filters[type] = options;
 };
 
-function formatStateWithAvatar(opt) {
-    return $('<span>' + opt.avatar + '&nbsp;' + opt.text + '</span>');
+
+var originBuildFilterRow = buildFilterRow;
+buildFilterRow = function (field, operator, values) {
+  originBuildFilterRow(field, operator, values);
+
+  var options = select2Options(field);
+  if (options) {
+    setSelect2FilterValues(field, options, values);
+    transformToSelect2(field, options);
+  }
 };
 
-var select2Filters = {};
 
-function transform_to_select2(field) {
-    field = field.replace('.', '_');
-    var filter = select2Filters[field];
-    if (filter !== undefined && $('#tr_' + field + ' .values .select2').size() == 0) {
-        $('#tr_' + field + ' .toggle-multiselect').hide();
-        $('#tr_' + field + ' .values .value').attr('multiple', 'multiple');
-        $('#tr_' + field + ' .values .value').select2({
-            ajax: {
-                url: filter['url'],
-                dataType: 'json',
-                delay: 250,
-                data: function (params) {
-                    return {q: params.term};
-                },
-                processResults: function (data, params) {
-                    return {results: data};
-                },
-                cache: true
-            },
-            placeholder: ' ',
-            minimumInputLength: filter['minimumInputLength'],
-            width: filter['width'],
-            templateResult: filter['formatState']
-        });
+function select2Options(field) {
+  var filter = availableFilters[field];
+  var options = select2Filters[filter['type']];
+
+  if (!options && filter['field_format']) {
+    options = select2Filters[field]
+  }
+
+  return options;
+};
+
+
+function setSelect2FilterValues(field, options, values) {
+  var needAddValues = !rowHasSelectTag(field);
+  if (needAddValues) { addSelectTag(field) }
+
+  var $select = findSelectTagInRowBy(field);
+  if (options['multiple'] !== false) { $select.attr('multiple', true) }
+
+  if (needAddValues) { addOptionTags($select, field, values); }
+};
+
+
+function addSelectTag(field) {
+  var fieldId = sanitizeToId(field);
+  $('#tr_' + fieldId).find('td.values').append(
+    '<span style="display:none;"><select class="value" id="values_'+fieldId+'_1" name="v['+field+'][]"></select></span>'
+  );
+};
+
+
+function addOptionTags($select, field, values) {
+  var filterValues = availableFilters[field]['values'];
+
+  for (var i = 0; i < filterValues.length; i++) {
+    var filterValue = filterValues[i];
+    var option = $('<option>');
+
+    if ($.isArray(filterValue)) {
+      option.val(filterValue[1]).text(filterValue[0]);
+      if ($.inArray(filterValue[1], values) > -1) { option.attr('selected', true); }
+    } else {
+      option.val(filterValue).text(filterValue);
+      if ($.inArray(filterValue, values) > -1) { option.attr('selected', true); }
     }
-};
+
+    $select.append(option);
+  }
+};
+
+
+function sanitizeToId(field) { return field.replace('.', '_') };
+
+function findSelectTagInRowBy(field) {
+  return findInRowBy(field, '.values select.value');
+};
+
+function rowHasSelectTag(field) {
+  return findInRowBy(field, '.values select.value').size() > 0;
+};
+
+function rowHasSelect2(field) {
+  return findInRowBy(field, '.values .select2').size() > 0;
+};
+
+function findInRowBy(field, selector) {
+  return $('#tr_' + sanitizeToId(field) + ' ' + selector);
+};
+
+function formatStateWithAvatar(opt) {
+  return $('<span>' + opt.avatar + '&nbsp;' + opt.text + '</span>');
+};
+
+
+function transformToSelect2(field, options) {
+  if (rowHasSelect2(field)) { return }
+
+  findInRowBy(field, '.toggle-multiselect').hide();
+  findSelectTagInRowBy(field).select2(buildSelect2Options(options));
+};
+
+
+function select2Tag(id, options) {
+  $(function () {
+    $('select#' + id).select2(buildSelect2Options(options));
+  });
+};
+
+
+function buildSelect2Options(options) {
+  result = {
+    placeholder: options['placeholder'] || '',
+    allowClear: !!options['allow_clear'],
+    minimumInputLength: options['min_input_length'] || 0,
+    templateResult: window[options['format_state']],
+    width: options['width'] || '60%'
+  };
+
+  addDataSourceOptions(result, options);
+  addTagsOptions(result, options);
+
+  return result;
+};
+
+
+function addDataSourceOptions(target, options) {
+  if (options['url']) {
+    target['ajax'] = {
+      url: options['url'],
+      dataType: 'json',
+      delay: SELECT2_DELAY,
+      data: function (params) {
+        return { q: params.term };
+      },
+      processResults: function (data, params) {
+        return { results: data };
+      },
+      cache: true
+    };
+  } else {
+    target['data'] = options['data'] || [];
+  }
+};
+
+
+function addTagsOptions(target, options) {
+  if (options['tags']) {
+    target['tags'] = true;
+    target['tokenSeparators'] = [','];
+    target['createTag'] = createTag;
+  } else {
+    target['tags'] = false;
+  }
+};
+
+
+function createTag(params) {
+  var term = $.trim(params.term);
+  if (term === '' || term.indexOf(',') > -1) {
+    return null; // Return null to disable tag creation
+  }
+
+  return { id: term, text: term };
+};

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails