From 877364c24ef9c7954f0e193456bb3f2d39169977 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 25 Mar 2013 10:26:49 +0100 Subject: First try --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 3f0aae4..a4ab062 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,6 +10,8 @@ Gemeinschaft42c::Application.routes.draw do end end + resources :switchboard_entries, :only => [:show] + resources :restore_jobs resources :groups do -- cgit v1.2.3 From 64653a9149eca977c16233abb0a472730b94a464 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 26 Mar 2013 16:55:08 +0100 Subject: Store reload interval in the Switchboard table. --- config/locales/views/switchboards/de.yml | 15 +++++++++++++++ config/locales/views/switchboards/en.yml | 15 +++++++++++++++ config/routes.rb | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/locales/views/switchboards/de.yml b/config/locales/views/switchboards/de.yml index 97a47b8..e73b100 100644 --- a/config/locales/views/switchboards/de.yml +++ b/config/locales/views/switchboards/de.yml @@ -9,6 +9,9 @@ de: page_title: 'Switchboards' name: 'Name' user_id: 'User' + reload_interval:: 'Reload Interval' + show_avatars: 'Show avatars' + entry_width: 'Entry width' actions: confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Switchboard' destroy: 'Löschen' @@ -20,6 +23,9 @@ de: page_title: 'Switchboard bearbeiten' name: 'Name' user_id: 'User' + reload_interval:: 'Reload Interval' + show_avatars: 'Show avatars' + entry_width: 'Entry width' actions: confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?' destroy: 'Löschen' @@ -42,4 +48,13 @@ de: user_id: label: 'User' hint: '' + reload_interval: + label: 'Reload Interval' + hint: 'Milliseconds. nil = no reload' + show_avatars: + label: 'Show avatars' + hint: '' + entry_width: + label: 'Entry width' + hint: '' submit: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/switchboards/en.yml b/config/locales/views/switchboards/en.yml index a860763..8489d28 100644 --- a/config/locales/views/switchboards/en.yml +++ b/config/locales/views/switchboards/en.yml @@ -9,6 +9,9 @@ en: page_title: 'Switchboards' name: 'Name' user_id: 'User' + reload_interval:: 'Reload Interval' + show_avatars: 'Show avatars' + entry_width: 'Entry width' actions: confirm_destroy: 'Are you sure you want to delete this Switchboard?' destroy: 'Delete' @@ -20,6 +23,9 @@ en: page_title: 'Show Switchboard' name: 'Name' user_id: 'User' + reload_interval:: 'Reload Interval' + show_avatars: 'Show avatars' + entry_width: 'Entry width' actions: confirm_destroy: 'Are you sure you want to delete this element?' destroy: 'Delete' @@ -42,4 +48,13 @@ en: user_id: label: 'User' hint: '' + reload_interval: + label: 'Reload Interval' + hint: 'Milliseconds. nil = no reload' + show_avatars: + label: 'Show avatars' + hint: '' + entry_width: + label: 'Entry width' + hint: '' submit: 'Submit' \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index a4ab062..ce4c028 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,7 +10,7 @@ Gemeinschaft42c::Application.routes.draw do end end - resources :switchboard_entries, :only => [:show] + resources :switchboard_entries, :only => [:show, :index] resources :restore_jobs -- cgit v1.2.3 From cea2cc3c1cc1e48fc4600c698d52dfda2bde4505 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 3 Apr 2013 22:08:19 +0200 Subject: Massive changes to the switchboard. --- config/routes.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index ce4c028..1fb9d7a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,14 @@ Gemeinschaft42c::Application.routes.draw do + namespace :api, defaults: {format: 'json'} do + namespace :v1 do + resources :switchboards, :only => [:show, :index] + resources :switchboard_entries, :only => [:show, :index] + resources :sip_accounts, :only => [:show, :index] + resources :phone_numbers, :only => [:show, :index] + end + + resources :rows + end resources :voicemail_accounts do resources :voicemail_settings @@ -10,8 +20,6 @@ Gemeinschaft42c::Application.routes.draw do end end - resources :switchboard_entries, :only => [:show, :index] - resources :restore_jobs resources :groups do @@ -64,9 +72,6 @@ Gemeinschaft42c::Application.routes.draw do resources :gui_functions - namespace :api do - resources :rows - end resources :phone_numbers, :only => [:sort] do collection { post :sort } -- cgit v1.2.3