redmine_extensions 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e01494fb8634b6116c7ee6df38c54a79845aed25438558c1bd068a24bc551d60
-  data.tar.gz: 3018303ecf9d11f4b9ed3720729cb7bcf0eef94adbdfebbc83fba0959a648698
+  metadata.gz: f91868f692beaaf8a3a69f028088732385f8670b4ff2103334708cf547827ae2
+  data.tar.gz: aae4b3809dd2ea1b11d8e754853d45e93c9bb1980fd0ee64cc9e1a95fde479b9
 SHA512:
-  metadata.gz: 10c0ece096eeeaa651feeae6aafa0004270bd7a87ff15f4e4f8118e596f0dae6c17c0cbd0841a132c079cdc8e49bbcd5f509a0d0adf6bb528692806354c3a7c0
-  data.tar.gz: 0c77dcfcafb5d125ab9cdb22fc7b134665cf4afa45373bcfc39ea1e6c42c3050dda90061be766f8d45a15a1cabd9d196ef85a1ce3089da9e74299342120151ee
+  metadata.gz: f7195001a6d347fed1b5708bfb3820d6dd9378b6a15900a9b740526bb5462f7b6a35ed1a1eac905778cd546269270179162994b14ff40f5bc81943a6cd52b8a7
+  data.tar.gz: 0d9d725a78e71b4fe08797515e02fc64930c14d4c1b89487684a67fc67d268f107b7994444e4384bb5a65ba65da5e5031ef7584c30bb704fb974fe653c4f801b

data/config/locales/en.yml

@@ -4,3 +4,5 @@ en:
   label_no_output: No output has been selected
   label_easy_query_outputs: Outputs
   text_modal_is_closing: This modal dialog will be closed automatically, please wait.
+  error_entity_name_is_used: "Entity name %{entity_name} is already used. Please use different"
+  error_plugin_name_is_used: "Plugin name %{plugin_name} is already used. Please use different"

data/lib/generators/redmine_extensions/entity/entity_generator.rb

@@ -30,6 +30,9 @@ module RedmineExtensions
     attr_reader :rys
     def initialize(*args)
       super
+      @model_name_camelized = model_name.camelize
+      check_existing_const
+
       @rys = !!options["rys"]
       @plugin_name_underscored = plugin_name.underscore
       @plugin_pretty_name = @plugin_name_underscored.titleize
@@ -44,6 +47,15 @@ module RedmineExtensions
       prepare_columns
     end
 
+    def check_existing_const
+      begin
+        @model_name_camelized.constantize
+        raise I18n.t(:error_entity_name_is_used, entity_name: @model_name_camelized)
+      rescue LoadError, NameError
+        # OK
+      end
+    end
+
     def copy_templates
       template '_form.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/_form.html.erb"
       template '_sidebar.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/_sidebar.html.erb"

data/lib/generators/redmine_extensions/entity/templates/mailer.rb.erb

@@ -2,7 +2,7 @@ class <%= model_name %>Mailer < Mailer
 
   helper :<%= model_name_pluralize_underscored %>
 
-  def <%= model_name_underscored %>_added(<%= model_name_underscored %>)
+  def <%= model_name_underscored %>_added(recipient, <%= model_name_underscored %>)
     <%- if project? -%>
     redmine_headers 'Project' => <%= model_name_underscored %>.project.identifier
 
@@ -16,11 +16,11 @@ class <%= model_name %>Mailer < Mailer
     message_id <%= model_name_underscored %>
     references <%= model_name_underscored %>
 
-    mail to: <%= model_name_underscored %>.notified_users,
+    mail to: recipient,
       subject: "#{l(:label_<%= model_name_underscored %>)}: #{<%= model_name_underscored %>.to_s}"
   end
 
-  def <%= model_name_underscored %>_updated(<%= model_name_underscored %>)
+  def <%= model_name_underscored %>_updated(recipient, <%= model_name_underscored %>)
     <%- if project? -%>
     redmine_headers 'Project' => <%= model_name_underscored %>.project.identifier
 
@@ -34,7 +34,7 @@ class <%= model_name %>Mailer < Mailer
     message_id <%= model_name_underscored %>
     references <%= model_name_underscored %>
 
-    mail to: <%= model_name_underscored %>.notified_users,
+    mail to: recipient,
       subject: "#{l(:label_<%= model_name_underscored %>)}: #{<%= model_name_underscored %>.to_s}"
   end
 

data/lib/generators/redmine_extensions/entity/templates/model.rb.erb

@@ -132,13 +132,17 @@ class <%= model_name %> < ActiveRecord::Base
 
   def send_create_notification
     # if Setting.notified_events.include?('<%= model_name_underscored %>_added')
-    <%= model_name %>Mailer.<%= model_name_underscored %>_added(self).deliver
+    notified_users.each do |user|
+      <%= model_name %>Mailer.<%= model_name_underscored %>_added(user, self).deliver
+    end
     # end
   end
 
   def send_update_notification
     # if Setting.notified_events.include?('<%= model_name_underscored %>_updated')
-    <%= model_name %>Mailer.<%= model_name_underscored %>_updated(self).deliver
+    notified_users.each do |user|
+      <%= model_name %>Mailer.<%= model_name_underscored %>_updated(user, self).deliver
+    end
     # end
   end
   <%- end -%>

data/lib/generators/redmine_extensions/plugin/plugin_generator.rb

@@ -15,6 +15,16 @@ module RedmineExtensions
 
       @plugin_path = (easy_plugin ? "plugins/easyproject/easy_plugins" : "plugins") + "/#{plugin_name_underscored}"
       @plugin_title = @plugin_name_underscored.camelize
+      check_existing_const
+    end
+
+    def check_existing_const
+      begin
+        @plugin_title.constantize
+        raise I18n.t(:error_plugin_name_is_used, plugin_name: @plugin_title)
+      rescue LoadError, NameError
+        # OK
+      end
     end
 
     def copy_templates

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails