summaryrefslogtreecommitdiff
path: root/app/controllers/switchboards_controller.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-04-04 12:05:30 +0200
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-04-04 12:05:30 +0200
commitd1ae9ca0016388a0778ece5f382c99f156bdabcb (patch)
tree632e46e34a4338a6e3b4f7cb2c29c123f50a4ea9 /app/controllers/switchboards_controller.rb
parent4ebbcf3b5576cc342086e2f54950a119a49f2bf9 (diff)
parentd6a733440eee34dab3daf25089d40aed91018a49 (diff)
Merge branch 'emberjs' into develop
Diffstat (limited to 'app/controllers/switchboards_controller.rb')
-rw-r--r--app/controllers/switchboards_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/switchboards_controller.rb b/app/controllers/switchboards_controller.rb
index f48e7fb..3e2f8d6 100644
--- a/app/controllers/switchboards_controller.rb
+++ b/app/controllers/switchboards_controller.rb
@@ -18,6 +18,7 @@ class SwitchboardsController < ApplicationController
@switchboard.show_avatars = true
@switchboard.entry_width = 2
@switchboard.reload_interval = 2000
+ @switchboard.amount_of_displayed_phone_numbers = 1
spread_breadcrumbs
end
@@ -55,7 +56,7 @@ class SwitchboardsController < ApplicationController
private
def switchboard_params
- params.require(:switchboard).permit(:name, :reload_interval, :show_avatars, :entry_width)
+ params.require(:switchboard).permit(:name, :reload_interval, :show_avatars, :entry_width, :amount_of_displayed_phone_numbers)
end
def spread_breadcrumbs