From cea2cc3c1cc1e48fc4600c698d52dfda2bde4505 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 3 Apr 2013 22:08:19 +0200
Subject: Massive changes to the switchboard.

---
 app/controllers/switchboard_entries_controller.rb | 26 ++++-------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

(limited to 'app/controllers/switchboard_entries_controller.rb')

diff --git a/app/controllers/switchboard_entries_controller.rb b/app/controllers/switchboard_entries_controller.rb
index 3f82976..ef6c72e 100644
--- a/app/controllers/switchboard_entries_controller.rb
+++ b/app/controllers/switchboard_entries_controller.rb
@@ -3,31 +3,13 @@ class SwitchboardEntriesController < ApplicationController
   authorize_resource :switchboard_entry, :through => :switchboard, :except => [:sort]
 
   def index
-    if @switchboard
-      @switchboard_entries = @switchboard.switchboard_entries
-      spread_breadcrumbs
-    else
-      @switchboard_entries = SwitchboardEntry.where(:id => params[:ids])
-    end
-
-    respond_to do |format|
-      format.html
-      format.json { render json: @switchboard_entries }
-    end
+    @switchboard_entries = @switchboard.switchboard_entries
+    spread_breadcrumbs
   end
 
   def show
-    if @switchboard
-      @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
-      spread_breadcrumbs
-    else
-      @switchboard_entry = SwitchboardEntry.find(params[:id])
-    end
-
-    respond_to do |format|
-      format.html
-      format.json { render json: @switchboard_entry }
-    end    
+    @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
+    spread_breadcrumbs
   end
 
   def new
-- 
cgit v1.2.3