rename more foreign uuid attributes

diff --git a/apps/workbench/app/models/api_client_authorization.rb b/apps/workbench/app/models/api_client_authorization.rb
index af47acc7f289b67715ebda61aa7db8f937c26220..620ebc7b9600b8ea777cf869874f0f4f45d3d71c 100644 (file)
--- a/apps/workbench/app/models/api_client_authorization.rb
+++ b/apps/workbench/app/models/api_client_authorization.rb
@@ -1,6 +1,6 @@
 class ApiClientAuthorization < ArvadosBase
   def attribute_editable?(attr)
-    ['expires_at', 'default_owner'].index attr
+    ['expires_at', 'default_owner_uuid'].index attr
   end
   def self.creatable?
     false

diff --git a/apps/workbench/app/views/users/index.html.erb b/apps/workbench/app/views/users/index.html.erb
index 442d47ef0ab2e3eb95565c033401a524bcba360b..e29aad53e5389df6d86604941c717b73bfd21878 100644 (file)
--- a/apps/workbench/app/views/users/index.html.erb
+++ b/apps/workbench/app/views/users/index.html.erb
@@ -38,7 +38,7 @@
       </td><td>
         <%= render_editable_attribute u, 'owner_uuid' %>
       </td><td>
-        <%= render_editable_attribute u, 'default_owner' %>
+        <%= render_editable_attribute u, 'default_owner_uuid' %>
       </td>
 
       <td>

diff --git a/services/api/db/migrate/20130708185153_rename_user_default_owner.rb b/services/api/db/migrate/20130708185153_rename_user_default_owner.rb
new file mode 100644 (file)
index 0000000..4e28740
--- /dev/null
+++ b/services/api/db/migrate/20130708185153_rename_user_default_owner.rb
@@ -0,0 +1,5 @@
+class RenameUserDefaultOwner < ActiveRecord::Migration
+  def change
+    rename_column :users, :default_owner, :default_owner_uuid
+  end
+end

diff --git a/services/api/db/schema.rb b/services/api/db/schema.rb
index 80325d2eeefa212b195dfe8c97a99fe8da8c95e2..c8d71e5196ef1e6ff43292fc4c116d8f841812ca 100644 (file)
--- a/services/api/db/schema.rb
+++ b/services/api/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130708182912) do
+ActiveRecord::Schema.define(:version => 20130708185153) do
 
   create_table "api_client_authorizations", :force => true do |t|
     t.string   "api_token",               :null => false
@@ -398,7 +398,7 @@ ActiveRecord::Schema.define(:version => 20130708182912) do
     t.boolean  "is_admin"
     t.text     "prefs"
     t.datetime "updated_at"
-    t.string   "default_owner"
+    t.string   "default_owner_uuid"
     t.boolean  "is_active",               :default => false
   end
 

diff --git a/services/api/lib/current_api_client.rb b/services/api/lib/current_api_client.rb
index 96009977cddcff5a8d59b34a28d8ddb377787aec..884c4f0c26351a191e8786d4d0f5c6bed7e34a65 100644 (file)
--- a/services/api/lib/current_api_client.rb
+++ b/services/api/lib/current_api_client.rb
@@ -14,8 +14,8 @@ module CurrentApiClient
   def current_default_owner
     # owner_uuid for newly created objects
     ((current_api_client_authorization &&
-      current_api_client_authorization.default_owner) ||
-     (current_user && current_user.default_owner) ||
+      current_api_client_authorization.default_owner_uuid) ||
+     (current_user && current_user.default_owner_uuid) ||
      (current_user && current_user.uuid) ||
      nil)
   end