redmine_crm 0.0.60 → 0.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4adb8a5f98b9989c95a54071384b427de1c34bcb21796475973f2b26e29d5d21
-  data.tar.gz: d2d29aefe59b7f0d9ce46e1d8586ac0bb2aa913d2d2a6d5435f88510f4ee1065
+  metadata.gz: fc50c105951bb021c6259da95f9cef9fdd018e4c97e5f6647b1d7e52587e0a97
+  data.tar.gz: e61bf0a052d3d7b4b6b50f8af5ef94ab384bc1487bdc1eb1bdbe27779225fdda
 SHA512:
-  metadata.gz: e42a0654d5415acbdfafd653096eea4c0276d75fb0b489e1cf9034b773bdcac837be3ef4690ae48ecfa855fd17ba8d5bbcdd10810233e33e82775cb3b9a777da
-  data.tar.gz: 58290aa95c957eb789bb5d02d8c7f59b61da91169ebd689fe4f1fb2dfc52a1a9221728e074ec7a5868d6469c838aeeaec1f2448dae348afb9edeb0a8294c23ec
+  metadata.gz: 3efd69c7eb987ef3b570c3a97916b2e448063021b01a16cee2acb4119ad30ce46f8a7d8fc8b4d8267eaa6886115d0cda3c214e6f719c45b7792a629600790cf1
+  data.tar.gz: 2352b2d60a060152002120defc453fdb7aab2617677d38c31ada078226a5887f74cef6361c31333a20ea57b3709b2c388895b62821d85d6136e8173ea49910b5

data/bitbucket-pipelines.yml

@@ -12,6 +12,7 @@ pipelines:
         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
+          - sed -i "s/'rubyzip'/'rubyzip'\n  spec.add_runtime_dependency 'loofah', '~>2.19.1'/g" redmine_crm.gemspec
           - bundle install
           - bundle exec rake test DB=sqlite
           - bundle exec rake test DB=postgresql

data/config/currency_iso.json

@@ -1813,7 +1813,7 @@
     "priority": 100,
     "iso_code": "RUB",
     "name": "Russian Ruble",
-    "symbol": "RUB",
+    "symbol": "₽",
     "alternate_symbols": ["руб.", "р."],
     "subunit": "Kopeck",
     "subunit_to_unit": 100,

data/doc/CHANGELOG

@@ -4,6 +4,15 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2023 RedmineUP
 https://www.redmineup.com/
 
+== 2023-11-15 v0.0.62
+
+* Redmine 5.1 compatibility fixes
+
+== 2023-09-27 v0.0.61
+
+* Reverted time picker calendar
+* Added helper methods for time format
+
 == 2023-09-20 v0.0.60
 
 * Fixed SQL injection 

data/lib/redmine_crm/helpers/calendars_helper.rb

@@ -0,0 +1,22 @@
+module RedmineCrm
+  module CalendarsHelper
+
+    def calendar_day_css_classes(calendar, day)
+      css = day.month==calendar.month ? +'even' : +'odd'
+      css << " today" if User.current.today == day
+      css << " nwday" if non_working_week_days.include?(day.cwday)
+      css
+    end
+
+    def non_working_week_days
+      @non_working_week_days ||= begin
+        days = Setting.non_working_week_days
+        if days.is_a?(Array) && days.size < 7
+          days.map(&:to_i)
+        else
+          []
+        end
+      end
+    end
+  end
+end

data/lib/redmine_crm/helpers/external_assets_helper.rb

@@ -16,12 +16,5 @@ module RedmineCrm
       javascript_include_tag('Chart.bundle.min', plugin: GEM_NAME)
     end
 
-    def timepicker_assets
-      return if @timepicker_tag_included
-
-      @timepicker_tag_included = true
-      javascript_include_tag('timepicker_addon', plugin: GEM_NAME) +
-        stylesheet_link_tag('timepicker_addon', plugin: GEM_NAME)
-    end
   end
 end

data/lib/redmine_crm/helpers/form_tag_helper.rb

@@ -73,33 +73,16 @@ module RedmineCrm
       javascript_tag("setSelect2Filter('#{type}', #{options.to_json});") unless type.empty?
     end
 
-    def datetime_calendar_for(field_id)
-      include_datetime_calendar_headers_tags
-      javascript_tag("$(function() { $('##{field_id}').datetimepicker(dateTimePickerOptions); });")
+    def format_datetime(time)
+      formated_time = format_time(time, false)
+      formated_date = ::I18n.l(time.to_date, format: '%Y-%m-%d')
+      "#{formated_date} #{formated_time}"
     end
 
-    def include_datetime_calendar_headers_tags
-      unless @datetime_calendar_headers_tags
-        tags = ''.html_safe
-        @datetime_calendar_headers_tags = true
-        content_for :header_tags do
-          start_of_week = Setting.start_of_week
-          start_of_week = l(:general_first_day_of_week, :default => '1') if start_of_week.blank?
-          start_of_week = start_of_week.to_i % 7
+    def format_datetime_date(time)
+      formated_date = ::I18n.l(time.to_date, format: '%Y-%m-%d')
+      "#{formated_date}"
+    end    
 
-          locale_keys = ::I18n.backend.send(:translations)[::I18n.config.locale]
-          time_format = Setting.time_format.blank? ? locale_keys[:time][:formats][:time] : Setting.time_format
-          time_format = time_format.to_s.gsub('%H', 'H').gsub('%I', 'hh').gsub('%M', 'mm').gsub('%p', 'tt')
-
-          date_format = 'yy-mm-dd'
-          tags << javascript_tag(
-            "var dateTimePickerOptions = {dateFormat: '#{date_format}', timeFormat: '#{time_format}', firstDay: #{start_of_week}," +
-              "showOn: 'button', buttonImageOnly: true, buttonImage: '" +
-              path_to_image('/images/calendar.png') +
-              "', showButtonPanel: true, controlType: 'select', oneLine: true, };")
-          tags
-        end
-      end
-    end
   end
 end

data/lib/redmine_crm/hooks/views_layouts_hook.rb

@@ -4,6 +4,7 @@ module RedmineCrm
   module Hooks
     class ViewsLayoutsHook < Redmine::Hook::ViewListener
       def view_layouts_base_html_head(_context = {})
+        stylesheet_link_tag(:calendars, plugin: 'redmine_crm') +
         stylesheet_link_tag(:money, plugin: 'redmine_crm')
       end
     end

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

@@ -35,7 +35,6 @@ module RedmineCrm
 
       delegate :id,
                :subject,
-               :description,
                :visible?,
                :closed?,
                :start_date,
@@ -104,6 +103,10 @@ module RedmineCrm
         @project ||= ProjectDrop.new @issue.project if @issue.project
       end
 
+      def description
+        @description ||= replace_images_urls(@issue.description)
+      end
+
       def subtasks
         @subtasks ||= IssuesDrop.new @issue.children
       end
@@ -117,11 +120,11 @@ module RedmineCrm
       end
 
       def notes
-        @notes ||= @issue.journals.where("#{Journal.table_name}.notes IS NOT ?", nil).order(:created_on).map(&:notes)
+        @notes ||= @issue.journals.where.not(notes: [nil, '']).order(:created_on).map(&:notes).map { |note| replace_images_urls(note) }
       end
 
       def journals
-        @journals ||= JournalsDrop.new @issue.journals.where("#{Journal.table_name}.notes IS NOT ?", nil)
+        @journals ||= JournalsDrop.new(@issue.journals.where.not(notes: nil).find_each { |journal| journal.notes = replace_images_urls(journal.notes) })
       end
 
       def tags
@@ -155,6 +158,19 @@ module RedmineCrm
       def custom_field_values
         @issue.custom_field_values
       end
+
+      private
+
+      def replace_images_urls(text)
+        text.gsub(/\!.*\!/) do |i_name|
+          i_name = i_name.delete('!')
+          i_name_css = i_name.scan(/^\{.*\}/).first.to_s
+          attachment = @issue.attachments.find_by(filename: i_name.gsub(i_name_css, ''))
+          image = AttachmentDrop.new attachment if attachment
+          attach_url = image.try(:url)
+          attach_url ? "!#{i_name_css}#{attach_url}!" : i_name
+        end
+      end
     end
 
     class JournalsDrop < ::Liquid::Drop

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.60'
+  VERSION = '0.0.62'
 end

data/lib/redmine_crm.rb

@@ -38,6 +38,7 @@ require 'redmine_crm/liquid/drops/time_entries_drop'
 require 'redmine_crm/liquid/drops/attachment_drop'
 require 'redmine_crm/liquid/drops/issue_relations_drop'
 
+require 'redmine_crm/helpers/calendars_helper'
 require 'redmine_crm/helpers/external_assets_helper'
 require 'redmine_crm/helpers/form_tag_helper'
 require 'redmine_crm/assets_manager'
@@ -59,6 +60,7 @@ end
 RedmineCrm::AssetsManager.install_assets
 
 if defined?(ActionView::Base)
+  ActionView::Base.send :include, RedmineCrm::CalendarsHelper
   ActionView::Base.send :include, RedmineCrm::ExternalAssetsHelper
   ActionView::Base.send :include, RedmineCrm::FormTagHelper
 end

data/test/liquid/filters/base_filter_test.rb

@@ -61,7 +61,7 @@ module RedmineCrm
     end
 
     def test_currency_filter
-      assert_equal '99,99 RUB', @liquid_render.render("{{99.99 | currency: 'RUB' }}")
+      assert_equal '99,99 ₽', @liquid_render.render("{{99.99 | currency: 'RUB' }}")
     end
   end
 end

data/test/money_helper_test.rb

@@ -5,7 +5,7 @@ class MoneyHelperTest < ActiveSupport::TestCase
 
   def test_price_to_currency
     assert_equal '$3,265.65', price_to_currency(3265.65, 'USD')
-    assert_equal '3.265,65 RUB', price_to_currency(3265.65, 'RUB')
+    assert_equal '3.265,65 ₽', price_to_currency(3265.65, 'RUB')
     assert_equal '3,200.0', price_to_currency(3200, '')
     assert_equal '3,200.0', price_to_currency(3200, 'Foo')
   end

data/vendor/assets/stylesheets/calendars.css

@@ -0,0 +1,15 @@
+table.cal {width: 100%; margin: 0 0 6px 0; border: 1px solid #c0c0c0; border-spacing: 0; border-radius: 3px;}
+table.cal thead th {width: 14%; background-color:#EEEEEE; padding: 4px; }
+table.cal thead th.week-number {width: auto;}
+table.cal tbody tr {height: 100px;}
+table.cal td .icon {padding-top: 2px; padding-bottom: 3px;}
+table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em; border-bottom: 0; border-right: 0;}
+table.cal td.week-number { background-color:#EEEEEE; padding: 4px; border:none; font-size: 1em;}
+table.cal td p.day-num {font-size: 1.1em; text-align:right;}
+table.cal td.odd p.day-num {color: #bbb;}
+table.cal td.today {background:#ffffdd;}
+table.cal td.today p.day-num {font-weight: bold;}
+table.cal td.nwday:not(.odd) {background-color:#f1f1f1;}
+table.cal .starting a.issue, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
+table.cal .ending a.issue, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
+table.cal .starting.ending a.issue, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.62
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,6 +143,7 @@ files:
 - lib/redmine_crm/currency/heuristics.rb
 - lib/redmine_crm/currency/loader.rb
 - lib/redmine_crm/engine.rb
+- lib/redmine_crm/helpers/calendars_helper.rb
 - lib/redmine_crm/helpers/external_assets_helper.rb
 - lib/redmine_crm/helpers/form_tag_helper.rb
 - lib/redmine_crm/helpers/tags_helper.rb
@@ -215,6 +216,7 @@ files:
 - vendor/assets/javascripts/select2.js
 - vendor/assets/javascripts/select2_helpers.js
 - vendor/assets/javascripts/timepicker_addon.js
+- vendor/assets/stylesheets/calendars.css
 - vendor/assets/stylesheets/money.css
 - vendor/assets/stylesheets/select2.css
 - vendor/assets/stylesheets/timepicker_addon.css