Merge branch 'master' into 2871-preload-objects

[arvados.git] / apps / workbench / app / controllers / application_controller.rb

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 36cdb842f3259fe28b82e5e3ee75d8bfc87cd81a..c9a761fe232d2a73a3a0a729f288eb4e63c056fa 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -145,9 +145,18 @@ class ApplicationController < ActionController::Base
     @new_resource_attrs ||= params[model_class.to_s.underscore.singularize]
     @new_resource_attrs ||= {}
     @new_resource_attrs.reject! { |k,v| k.to_s == 'uuid' }
-    @object ||= model_class.new @new_resource_attrs
-    @object.save!
-    show
+    @object ||= model_class.new @new_resource_attrs, params["options"]
+    if @object.save
+      respond_to do |f|
+        f.json { render json: @object.attributes.merge(href: url_for(@object)) }
+        f.html {
+          redirect_to @object
+        }
+        f.js { render }
+      end
+    else
+      self.render_error status: 422
+    end
   end
 
   def destroy
@@ -462,10 +471,12 @@ class ApplicationController < ActionController::Base
   def preload_links_for_objects objects_and_uuids
     uuids = objects_and_uuids.collect { |x| x.is_a?(String) ? x : x.uuid }
     @all_links_for ||= {}
+
+    # if already preloaded for all of these uuids, return
     if not uuids.select { |x| @all_links_for[x].nil? }.any?
-      # already preloaded for all of these uuids
       return
     end
+
     uuids.each do |x|
       @all_links_for[x] = []
     end
@@ -480,11 +491,11 @@ class ApplicationController < ActionController::Base
   helper_method :get_n_objects_of_class
   def get_n_objects_of_class dataclass, size
     # if the objects_map_for has a value for this dataclass, and the size used
-    # to retrieve those objects is greater than equal to size, return it
+    # to retrieve those objects is greater than or equal to size, return it
     size_key = "#{dataclass}_size"
     if @objects_map_for && @objects_map_for[dataclass] && @objects_map_for[size_key] &&
         (@objects_map_for[size_key] >= size)
-      return @objects_map_for[dataclass] 
+      return @objects_map_for[dataclass]
     end
 
     @objects_map_for = {}
@@ -505,8 +516,9 @@ class ApplicationController < ActionController::Base
   helper_method :preload_collections_for_objects
   def preload_collections_for_objects uuids
     @all_collections_for ||= {}
+
+    # if already preloaded for all of these uuids, return
     if not uuids.select { |x| @all_collections_for[x].nil? }.any?
-      # already preloaded for all of these uuids
       return
     end
 
@@ -538,9 +550,9 @@ class ApplicationController < ActionController::Base
       uuids << fixup[1]
     end
 
+    # if already preloaded for all of these uuids, return
     @all_log_collections_for ||= {}
     if not uuids.select { |x| @all_log_collections_for[x].nil? }.any?
-      # already preloaded for all of these uuids
       return
     end