Merge branch 'master' of github.com:concerto/concerto

concerto · Jul 9, 2012 · bfe7b64 · bfe7b64
2 parents 2ebc63d + 6b2c7c6
commit bfe7b64
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/app/controllers/concerto_plugins_controller.rb b/app/controllers/concerto_plugins_controller.rb
@@ -6,7 +6,7 @@ def index
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @concerto_plugins }
+      format.json { render json => @concerto_plugins }
     end
   end
 
@@ -17,7 +17,7 @@ def show
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @concerto_plugin }
+      format.json { render json => @concerto_plugin }
     end
   end
 
@@ -28,7 +28,7 @@ def new
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render json: @concerto_plugin }
+      format.json { render json => @concerto_plugin }
     end
   end
 
@@ -45,11 +45,11 @@ def create
     respond_to do |format|
       if @concerto_plugin.save    
         write_Gemfile()
-        format.html { redirect_to @concerto_plugin, notice: 'Concerto plugin was successfully created.' }
-        format.json { render json: @concerto_plugin, status: :created, location: @concerto_plugin }
+        format.html { redirect_to @concerto_plugin, notice => 'Concerto plugin was successfully created.' }
+        format.json { render json: @concerto_plugin, status => :created, location: @concerto_plugin }
       else
         format.html { render action: "new" }
-        format.json { render json: @concerto_plugin.errors, status: :unprocessable_entity }
+        format.json { render json: @concerto_plugin.errors, status => :unprocessable_entity }
       end
     end
   end
@@ -62,11 +62,11 @@ def update
     respond_to do |format|
       if @concerto_plugin.update_attributes(params[:concerto_plugin])
         write_Gemfile()
-        format.html { redirect_to @concerto_plugin, notice: 'Concerto plugin was successfully updated.' }
+        format.html { redirect_to @concerto_plugin, notice => 'Concerto plugin was successfully updated.' }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
-        format.json { render json: @concerto_plugin.errors, status: :unprocessable_entity }
+        format.json { render json: @concerto_plugin.errors, status => :unprocessable_entity }
       end
     end
   end