From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 18 Nov 2016 12:20:10 +0000 (+0000)
Subject: Code cleanup (#24007).
X-Git-Tag: 3.4.0~593
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9c3e3a4276612f60552379518ab8c9a11319e73b;p=redmine.git

Code cleanup (#24007).

git-svn-id: http://svn.redmine.org/redmine/trunk@15964 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/generators/redmine_plugin/redmine_plugin_generator.rb b/lib/generators/redmine_plugin/redmine_plugin_generator.rb
index a9d701577..ce2e2aa42 100644
--- a/lib/generators/redmine_plugin/redmine_plugin_generator.rb
+++ b/lib/generators/redmine_plugin/redmine_plugin_generator.rb
@@ -7,12 +7,7 @@ class RedminePluginGenerator < Rails::Generators::NamedBase
     super
     @plugin_name = file_name.underscore
     @plugin_pretty_name = plugin_name.titleize
-    if Redmine::Configuration['plugins_path'].nil?
-      @plugin_path = File.join(Rails.root, 'plugins', plugin_name)
-    else
-      @plugin_path = File.join(Redmine::Configuration['plugins_path'], plugin_name)
-    end
-    puts @plugin_path
+    @plugin_path = File.join(Redmine::Plugin.directory, plugin_name)
   end
 
   def copy_templates
diff --git a/lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb b/lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb
index 231b68810..9c42d938b 100644
--- a/lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb
+++ b/lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb
@@ -9,11 +9,7 @@ class RedminePluginControllerGenerator < Rails::Generators::NamedBase
     super
     @plugin_name = file_name.underscore
     @plugin_pretty_name = plugin_name.titleize
-    if Redmine::Configuration['plugins_path'].nil?
-      @plugin_path = File.join(Rails.root, 'plugins', plugin_name)
-    else
-      @plugin_path = File.join(Redmine::Configuration['plugins_path'], plugin_name)
-    end
+    @plugin_path = File.join(Redmine::Plugin.directory, plugin_name)
     @controller_class = controller.camelize
   end
 
diff --git a/lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb b/lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb
index bea9b6808..f26f8779c 100644
--- a/lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb
+++ b/lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb
@@ -14,11 +14,7 @@ class RedminePluginModelGenerator < Rails::Generators::NamedBase
     super
     @plugin_name = file_name.underscore
     @plugin_pretty_name = plugin_name.titleize
-    if Redmine::Configuration['plugins_path'].nil?
-      @plugin_path = File.join(Rails.root, 'plugins', plugin_name)
-    else
-      @plugin_path = File.join(Redmine::Configuration['plugins_path'], plugin_name)
-    end
+    @plugin_path = File.join(Redmine::Plugin.directory, plugin_name)
     @model_class = model.camelize
     @table_name = @model_class.tableize
     @migration_filename = "create_#{@table_name}"