clean up SDK examples

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index d16656602cd9893760eda32e4e1164310922a631..f630e764f22432ce7f9c1fc703cc30295140c6ff 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -3,6 +3,10 @@ module ApplicationHelper
     controller.current_user
   end
 
+  def current_api_host
+    Rails.configuration.arvados_v1_base.gsub /https?:\/\/|\/arvados\/v1/,''
+  end
+
   def render_content_from_database(markup)
     raw RedCloth.new(markup).to_html
   end

diff --git a/apps/workbench/app/views/application/_arvados_object.html.erb b/apps/workbench/app/views/application/_arvados_object.html.erb
index 1e3a88190dcc02ea4a1c0f8fb65e968693f817f3..c61d74fde7fc82cc42cd4651ad0a5c1999ac1214 100644 (file)
--- a/apps/workbench/app/views/application/_arvados_object.html.erb
+++ b/apps/workbench/app/views/application/_arvados_object.html.erb
@@ -48,9 +48,9 @@
     <div id="arvados-object-curl" class="tab-pane fade">
       <pre>
 curl -X PUT \
- -H "Authorization: OAuth2 $arv_api_token" \
+ -H "Authorization: OAuth2 $ARVADOS_API_TOKEN" \
  --data-urlencode <%= @object.class.to_s.underscore %>@/dev/stdin \
- <%= Rails.configuration.arvados_v1_base.sub 'http://', 'https://' %>/<%= @object.class.to_s.pluralize.underscore %>/<%= @object.uuid %> \
+ https://$ARVADOS_API_HOST/arvados/v1/<%= @object.class.to_s.pluralize.underscore %>/<%= @object.uuid %> \
  &lt;&lt;EOF
 <%= JSON.pretty_generate({@object.attributes.keys[-3] => @object.attributes.values[-3]}) %>
 EOF
@@ -59,9 +59,6 @@ EOF
 
     <div id="arvados-object-arv" class="tab-pane fade">
       <pre>
-ARVADOS_API_HOST=<%= Rails.configuration.arvados_v1_base.gsub /https?:\/\/|\/arvados\/v1/,'' %>
-ARVADOS_API_TOKEN=xxxxxxxxxxxxxxxxxxxxx
-
 arv --pretty <%= @object.class.to_s.underscore %> get \
  --uuid <%= @object.uuid %>