From 674fa0f74a011a038273984d66b996c6e7ed3802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Thu, 31 Jan 2019 16:14:03 +0100
Subject: [PATCH] Easy modifications

---
 Gemfile                                           |  4 +++-
 lib/redmine_dmsf/patches/projects_helper_patch.rb | 15 ++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index e6511368..d0bce171 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,6 @@
 
 source 'https://rubygems.org'
 
-gem 'rubyzip', '>= 1.1.3'
 gem 'zip-zip'
 gem 'simple_enum'
 gem 'uuidtools'
@@ -31,6 +30,9 @@ gem 'dalli'
 # Redmine extensions
 unless %w(easyproject easy_gantt).any? { |plugin| Dir.exist?(File.expand_path("../../#{plugin}", __FILE__)) }
   gem 'redmine_extensions', '~> 0.2.5'
+  gem 'rubyzip', '>= 1.1.3'
+else
+  gem 'rubyzip', '>= 1.0.0'
 end
 
 # Dav4Rack
diff --git a/lib/redmine_dmsf/patches/projects_helper_patch.rb b/lib/redmine_dmsf/patches/projects_helper_patch.rb
index ed7a11fa..9913c4a1 100644
--- a/lib/redmine_dmsf/patches/projects_helper_patch.rb
+++ b/lib/redmine_dmsf/patches/projects_helper_patch.rb
@@ -41,12 +41,9 @@ module RedmineDmsf
   end
 end
 
-# if Redmine::Plugin.installed?(:easy_extensions)
-#   RedmineExtensions::PatchManager.register_helper_patch 'ProjectsHelper',
-#     'RedmineDmsf::Patches::ProjectHelperPatch', prepend: true
-# else
-#   RedmineExtensions::PatchManager.register_patch_to_be_first 'ProjectsHelper',
-#   'RedmineDmsf::Patches::ProjectHelperPatch', prepend: true, first: true
-# end
-
-ProjectsController.send :helper, RedmineDmsf::Patches::ProjectHelperPatch
\ No newline at end of file
+if Redmine::Plugin.installed?(:easy_extensions)
+  RedmineExtensions::PatchManager.register_helper_patch 'ProjectsHelper',
+    'RedmineDmsf::Patches::ProjectHelperPatch', prepend: true
+else
+  ProjectsController.send :helper, RedmineDmsf::Patches::ProjectHelperPatch
+end
\ No newline at end of file