redmine_crm 0.0.50 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db9ce68acb0514cc0652eb603284800851c5a2a
-  data.tar.gz: ba29da7491709f471cd6be83674fb70d73b7d710
+  metadata.gz: 3e9789117b9a4f848202900cd758b2fad6ca12bb
+  data.tar.gz: a6cb4c6de03bbc3eb6637d67c6bea1a3e5e60cd4
 SHA512:
-  metadata.gz: f6b1ff459d4b63a648703af6306ccc87c81278d83fc057ea911a849690565adf41b5e31096f966ab7b67195c55967721337fb6b72508ecb739c7c71bcaab7b06
-  data.tar.gz: 81b37a16be40aa4af841f63fe659a3b74c70977a36547fd73d375d523b1c8c9b6110500be48c5fb9a85055ba75c3ce46bf2aab5795a00edcea8b37270552ddcb
+  metadata.gz: 622502f3842e4c207fd49b2b234c5f3558c9dfe02b1513260e62942a78bf57e4b3d387571abf74069b0c72d3935f593b110f677fc56213076ba46e0f73476292
+  data.tar.gz: e36b0a353a72dc5c4570663863fded89f4a277629fb77fb3da4d6fce8f7caa536945e3778a8a1935651f8bb47ad56a54ecf50bc5f5cd424aa330b253c6c11620

data/app/views/redmine_crm/settings.html.erb

@@ -3,7 +3,7 @@
 <div id="settings">
   <%= form_tag({ action: 'settings', id: @section[:id] }) do %>
     <div class="box tabular settings">
-      <%= render_tabs @section_tabs %>
+      <%= render partial: 'money' %>
     </div>
     <%= submit_tag l(:button_apply) %>
   <% end %>

data/bitbucket-pipelines.yml

@@ -32,6 +32,7 @@ pipelines:
           - sed -i "s/'pg'/'pg', '~> 0.18.0'/g" redmine_crm.gemspec
           - sed -i "s/^end/  spec.add_development_dependency 'minitest', '~> 5.11.3'\nend/g" redmine_crm.gemspec
           - sed -i "s/^end/  spec.add_development_dependency 'sprockets', '~> 3.5.2'\nend/g" redmine_crm.gemspec
+          - sed -i "s/^end/  spec.add_development_dependency 'thor', '~> 0.20.3'\nend/g" redmine_crm.gemspec
           - bundle install
           - bundle exec rake test DB=sqlite
           - bundle exec rake test DB=mysql

data/config/locales/en.yml

@@ -1,5 +1,5 @@
 en:
-  label_redmine_crm_settings: Redmine Crm Settings
+  label_redmine_crm_settings: Money Settings
   label_redmine_crm_money: Money
 
   label_redmine_crm_disable_taxes: Disable taxes

data/config/locales/ru.yml

@@ -1,5 +1,5 @@
 ru:
-  label_redmine_crm_settings: Настройки Redmine Crm
+  label_redmine_crm_settings: Настройки валют
   label_redmine_crm_money: Деньги
 
   label_redmine_crm_disable_taxes: Отключить налоги

data/doc/CHANGELOG

@@ -4,6 +4,12 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2019 RedmineUP
 https://www.redmineup.com/
  
+== 2019-12-20 v0.0.51
+
+* Changed drafts params 
+* Changed Money settings UI
+* Fixed bug with settings access
+
 == 2019-11-18 v0.0.50
 
 * Fixed bug with settings initialization

data/lib/redmine_crm/acts_as_draftable/rcrm_acts_as_draftable.rb

@@ -78,8 +78,10 @@ module RedmineCrm
         target
       end
 
-      def drafts(user)
-        Draft.where(user_id: user.id, target_type: name)
+      def drafts(user = nil)
+        drafts = Draft.where(target_type: name)
+        drafts = drafts.where(user_id: user.id) if user
+        drafts
       end
     end # ClassMethods
 

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

@@ -100,7 +100,7 @@ module RedmineCrm
         def tagged_with(input, tags, match='all')
           return input unless input.respond_to?(:select)
           input = input.values if input.is_a?(Hash)
-          tag_list = input.is_a?(Array) ? tags.sort : tags.split(',').map(&:strip).sort
+          tag_list = tags.is_a?(Array) ? tags.sort : tags.split(',').map(&:strip).sort
           case match
           when "all"
             input.select do |object|

data/lib/redmine_crm/settings.rb

@@ -26,6 +26,8 @@ module RedmineCrm
 
       # Use apply instead attrs assign because it can rewrite other attributes
       def apply=(values)
+        initialize_gem_settings unless @settings_initialized
+
         Setting.plugin_redmine_crm = Setting.plugin_redmine_crm.merge(values)
       end
 

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.50'
+  VERSION = '0.0.51'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.51
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails