Merge pull request #87 from rightscale/OPS-3243_change_location_of_te…

…mplate_load Ops 3243 change location of template load
flexera-public · Aug 18, 2016 · c7b5fb4 · c7b5fb4
2 parents f5965f6 + 2f074b2
commit c7b5fb4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -172,3 +172,7 @@ Reverted bad release
 Version 2.1.20
 --------------
 * Bugfix: We now correctly report the correct number of tasks waiting, in the json interface
+
+Version 2.1.21
+--------------
+* Bugfix: Pull the correct path whenever loading up the erb template in webui.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.1.20)
+    right_chimp (2.1.21)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)

diff --git a/lib/right_chimp/daemon/ChimpDaemon.rb b/lib/right_chimp/daemon/ChimpDaemon.rb
@@ -525,7 +525,7 @@ def do_GET(req, resp)
         # First determine the path to the files to serve
         #
         if ENV['CHIMP_TEST'] != 'TRUE'
-          template_path = File.join(Gem.dir, 'gems', 'right_chimp-' + VERSION, 'lib/right_chimp/templates')
+          template_path = File.expand_path('../templates', __dir__)
         else
           template_path = 'lib/right_chimp/templates'
         end

diff --git a/lib/right_chimp/version.rb b/lib/right_chimp/version.rb
@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.20"
+  VERSION = "2.1.21"
 end