Merge pull request #42 from onozaty/develop-2.2.0

Develop 2.2.0
onozaty · May 2, 2019 · 433cbff · 433cbff
2 parents 33491bb + de63571
commit 433cbff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/after_init.rb b/after_init.rb
@@ -0,0 +1 @@
+require_dependency 'view_customize/view_hook'
diff --git a/init.rb b/init.rb
@@ -1,11 +1,9 @@
-require_dependency 'view_customize/view_hook'
-
 Redmine::Plugin.register :view_customize do
   requires_redmine :version_or_higher => '3.1.0'
   name 'View Customize plugin'
   author 'onozaty'
   description 'View Customize plugin for Redmine'
-  version '2.1.0'
+  version '2.2.0'
   url 'https://github.com/onozaty/redmine-view-customize'
   author_url 'https://github.com/onozaty'
 
@@ -14,5 +12,10 @@
     :caption => :label_view_customize,
     :html => { :class => 'icon icon-view_customize'},
     :if => Proc.new { User.current.admin? }
+
+  should_be_disabled false if Redmine::Plugin.installed?(:easy_extensions)
+end
 
+unless Redmine::Plugin.installed?(:easy_extensions)
+  require_relative 'after_init'
 end