Merge pull request #68 from sergii/cleanup_actions

Clean up actions
kandanapp · Feb 11, 2013 · 3019dd2 · 3019dd2
2 parents 5f81fb8 + aa2ffdd
commit 3019dd2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
@@ -34,12 +34,11 @@ def index
   def create
     @activity = Channel.find(params[:channel_id]).activities.build(params[:activity])
     @activity.user_id = current_user.id if @activity.action == "message"
-    if @activity.save
-      respond_to do |format|
+
+    respond_to do |format|
+      if @activity.save
         format.json { render :json => @activity, :status => :created }
-      end
-    else
-      respond_to do |format|
+      else
         format.json { render :json => @activity.errors, :status => :unprocessable_entity }
       end
     end

diff --git a/app/controllers/channels_controller.rb b/app/controllers/channels_controller.rb
@@ -26,12 +26,10 @@ def index
 
   def create
     @channel = Channel.new(params[:channel])
-    if @channel.save
-      respond_to do |format|
+    respond_to do |format|
+      if @channel.save
         format.json { render :json => @channel, :status => :created }
-      end
-    else
-      respond_to do |format|
+      else
         format.json { render :json => @channel.errors, :status => :unprocessable_entity }
       end
     end
@@ -46,12 +44,10 @@ def show
 
   def update
     @channel = Channel.find(params[:id])
-    if @channel.update_attributes(params[:channel])
-      respond_to do |format|
+    respond_to do |format|
+      if @channel.update_attributes(params[:channel])
         format.json { render :json => @channel, :status => :ok }
-      end
-    else
-      respond_to do |format|
+      else
         format.json { render :json => @channel.errors, :status => :unprocessable_entity }
       end
     end