Fix bugs in update proposal api.

nii-cloud · Dec 13, 2011 · a597fd5 · a597fd5
1 parent 597845a
commit a597fd5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
@@ -121,18 +121,18 @@ def update
 
     if @proposal.update_attributes(params[:proposal])
       @proposal.state = "init"
-      if @proposal.save
-        respond_to do |format|
-          format.html { redirect_to(proposals_url) }
-          format.json { render :json => @proposal.as_json, :location => @proposal }
-        end
-      else
-        respond_to do |format|
-          format.html { render :action => "new" }
-          format.json { render :json => {:errors => @proposal.errors}.as_json }
-        end
+      @proposal.save
+      respond_to do |format|
+        format.html { redirect_to(proposals_url) }
+        format.json { render :json => JSON.pretty_generate(@proposal.as_json) }
+      end
+    else
+      respond_to do |format|
+        format.html { render :action => "new" }
+        format.json { render :json => {:errors => @proposal.errors}.as_json }
       end
     end
+
   end
 
   def destroy

diff --git a/public/javascripts/rest_apis/index.js b/public/javascripts/rest_apis/index.js
@@ -165,6 +165,7 @@ function do_click_exec_btn(btn) {
       alert("Succeeded.");
     },
     error: function(data) {
+      $("#" + action + "_result_textarea").attr("rows", 1).val("");
       alert("Error occurred!!!");
     },
     complete: function() {