Merge branch 'master' into 3198-writable-fuse

[arvados.git] / apps / workbench / app / helpers / version_helper.rb

diff --git a/apps/workbench/app/helpers/version_helper.rb b/apps/workbench/app/helpers/version_helper.rb
index 0d021fa0de07b01101f7eb736fdb3475456037ed..6cae78f53efc495f4a54797b39dc6e6e889492a3 100644 (file)
--- a/apps/workbench/app/helpers/version_helper.rb
+++ b/apps/workbench/app/helpers/version_helper.rb
@@ -1,17 +1,30 @@
 module VersionHelper
-  include ArvadosApiClientHelper
+  # api_version returns the git commit hash for the API server's
+  # current version.  It is extracted from api_version_text, which
+  # returns the source_version provided by the discovery document and
+  # may have the word "-modified" appended to it (if the API server is
+  # running from a locally modified repository).
 
-  def api_version()
+  def api_version
+    api_version_text.sub(/[^[:xdigit:]].*/, '')
+  end
+
+  def api_version_text
     arvados_api_client.discovery[:source_version]
   end
 
-  def wb_version()
+  # wb_version and wb_version_text provide the same strings for the
+  # code version that this Workbench is currently running.
+
+  def wb_version
     Rails.configuration.source_version
   end
 
-  def wb_version_text()
-    wbv = wb_version
-    wbv += Rails.configuration.local_modified if Rails.configuration.local_modified
-    wbv
+  def wb_version_text
+    wb_version + (Rails.configuration.local_modified or '')
+  end
+
+  def version_link_target version
+    "https://arvados.org/projects/arvados/repository/changes?rev=#{version}"
   end
 end