From db9dbf03d88cfbd68ce99a242730b9e870339539 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 7 Mar 2013 13:15:35 +0100
Subject: Added Switchboard scaffold.

---
 app/controllers/switchboards_controller.rb   | 65 ++++++++++++++++++++++++++++
 app/helpers/switchboards_helper.rb           |  2 +
 app/models/call_route.rb                     |  2 +-
 app/models/switchboard.rb                    | 14 ++++++
 app/models/user.rb                           |  2 +
 app/views/switchboards/_form.html.haml       |  7 +++
 app/views/switchboards/_form_core.html.haml  |  2 +
 app/views/switchboards/_index_core.html.haml | 10 +++++
 app/views/switchboards/edit.html.haml        |  3 ++
 app/views/switchboards/index.html.haml       |  8 ++++
 app/views/switchboards/new.html.haml         |  3 ++
 app/views/switchboards/show.html.haml        | 12 +++++
 12 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/switchboards_controller.rb
 create mode 100644 app/helpers/switchboards_helper.rb
 create mode 100644 app/models/switchboard.rb
 create mode 100644 app/views/switchboards/_form.html.haml
 create mode 100644 app/views/switchboards/_form_core.html.haml
 create mode 100644 app/views/switchboards/_index_core.html.haml
 create mode 100644 app/views/switchboards/edit.html.haml
 create mode 100644 app/views/switchboards/index.html.haml
 create mode 100644 app/views/switchboards/new.html.haml
 create mode 100644 app/views/switchboards/show.html.haml

(limited to 'app')

diff --git a/app/controllers/switchboards_controller.rb b/app/controllers/switchboards_controller.rb
new file mode 100644
index 0000000..8f21d5e
--- /dev/null
+++ b/app/controllers/switchboards_controller.rb
@@ -0,0 +1,65 @@
+class SwitchboardsController < ApplicationController
+  load_and_authorize_resource :user
+  authorize_resource :switchboard, :through => :user
+
+  def index
+    @switchboards = @user.switchboards
+    spread_breadcrumbs
+  end
+
+  def show
+    @switchboard = @user.switchboards.find(params[:id])
+    spread_breadcrumbs
+  end
+
+  def new
+    @switchboard = @user.switchboards.build
+    spread_breadcrumbs
+  end
+
+  def create
+    @switchboard = @user.switchboards.build(switchboard_params)
+    spread_breadcrumbs
+    if @switchboard.save
+      redirect_to user_switchboards_path(@user), :notice => t('switchboards.controller.successfuly_created')
+    else
+      render :new
+    end
+  end
+
+  def edit
+    @switchboard = @user.switchboards.find(params[:id])
+    spread_breadcrumbs
+  end
+
+  def update
+    @switchboard = @user.switchboards.find(params[:id])
+    spread_breadcrumbs
+    if @switchboard.update_attributes(switchboard_params)
+      redirect_to [@user, @switchboard], :notice  => t('switchboards.controller.successfuly_updated')
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @switchboard = @user.switchboards.find(params[:id])
+    @switchboard.destroy
+    spread_breadcrumbs
+    redirect_to user_switchboards_path(@user), :notice => t('switchboards.controller.successfuly_destroyed')
+  end
+
+  private
+  def switchboard_params
+    params.require(:switchboard).permit(:name)
+  end
+
+  def spread_breadcrumbs
+    add_breadcrumb t("users.index.page_title"), tenant_users_path(@user.current_tenant)
+    add_breadcrumb @user, tenant_user_path(@user.current_tenant, @user)
+    add_breadcrumb t("switchboards.index.page_title"), user_switchboards_path(@user)
+    if @switchboard && !@switchboard.new_record?
+      add_breadcrumb @switchboard, user_switchboard_path(@user, @switchboard)
+    end
+  end  
+end
diff --git a/app/helpers/switchboards_helper.rb b/app/helpers/switchboards_helper.rb
new file mode 100644
index 0000000..6fbea8a
--- /dev/null
+++ b/app/helpers/switchboards_helper.rb
@@ -0,0 +1,2 @@
+module SwitchboardsHelper
+end
diff --git a/app/models/call_route.rb b/app/models/call_route.rb
index 8bc811a..6c54549 100644
--- a/app/models/call_route.rb
+++ b/app/models/call_route.rb
@@ -7,7 +7,7 @@ class CallRoute < ActiveRecord::Base
   has_many :route_elements, :dependent => :destroy, :order => :position
 
   validates :name,
-  					:presence => true
+            :presence => true
 
   validates :routing_table,
             :presence => true,
diff --git a/app/models/switchboard.rb b/app/models/switchboard.rb
new file mode 100644
index 0000000..cb0c70f
--- /dev/null
+++ b/app/models/switchboard.rb
@@ -0,0 +1,14 @@
+class Switchboard < ActiveRecord::Base
+  # https://github.com/rails/strong_parameters
+  include ActiveModel::ForbiddenAttributesProtection
+
+  validates :name,
+            :presence => true,
+            :uniqueness => {:scope => :user_id}
+
+  belongs_to :user, :touch => true
+
+  def to_s
+    self.name.to_s
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 913d75f..6091e32 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -94,6 +94,8 @@ class User < ActiveRecord::Base
   has_many :group_memberships, :as => :item, :dependent => :destroy, :uniq => true
   has_many :groups, :through => :group_memberships
   
+  has_many :switchboards, :dependent => :destroy
+
   # Avatar like photo  
   mount_uploader :image, ImageUploader  
 
diff --git a/app/views/switchboards/_form.html.haml b/app/views/switchboards/_form.html.haml
new file mode 100644
index 0000000..bb09713
--- /dev/null
+++ b/app/views/switchboards/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for([@user, @switchboard]) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .form-actions
+    = f.button :submit, conditional_t('switchboards.form.submit')
diff --git a/app/views/switchboards/_form_core.html.haml b/app/views/switchboards/_form_core.html.haml
new file mode 100644
index 0000000..61b5934
--- /dev/null
+++ b/app/views/switchboards/_form_core.html.haml
@@ -0,0 +1,2 @@
+.inputs
+  = f.input :name, :label => t('switchboards.form.name.label'), :hint => conditional_hint('switchboards.form.name.hint'), :autofocus => true
diff --git a/app/views/switchboards/_index_core.html.haml b/app/views/switchboards/_index_core.html.haml
new file mode 100644
index 0000000..858f624
--- /dev/null
+++ b/app/views/switchboards/_index_core.html.haml
@@ -0,0 +1,10 @@
+%table.table.table-striped
+  %tr
+    %th= t('switchboards.index.name')
+    %th
+
+  
+  - for switchboard in switchboards
+    %tr
+      %td= switchboard.name
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user, :child => switchboard}
\ No newline at end of file
diff --git a/app/views/switchboards/edit.html.haml b/app/views/switchboards/edit.html.haml
new file mode 100644
index 0000000..1ab0efe
--- /dev/null
+++ b/app/views/switchboards/edit.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("switchboards.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/switchboards/index.html.haml b/app/views/switchboards/index.html.haml
new file mode 100644
index 0000000..4f29d7d
--- /dev/null
+++ b/app/views/switchboards/index.html.haml
@@ -0,0 +1,8 @@
+- content_for :title, t("switchboards.index.page_title")
+
+.row
+  .span6
+    - if @switchboards && @switchboards.count > 0
+      = render :partial => "index_core", :locals => {:switchboards => @switchboards, :user => @user}
+
+    = render :partial => 'shared/create_link', :locals => {:parent => @user, :child_class => Switchboard}
\ No newline at end of file
diff --git a/app/views/switchboards/new.html.haml b/app/views/switchboards/new.html.haml
new file mode 100644
index 0000000..9f5918f
--- /dev/null
+++ b/app/views/switchboards/new.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("switchboards.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/switchboards/show.html.haml b/app/views/switchboards/show.html.haml
new file mode 100644
index 0000000..746e180
--- /dev/null
+++ b/app/views/switchboards/show.html.haml
@@ -0,0 +1,12 @@
+- content_for :title, t("switchboards.show.page_title")
+
+.row
+  .span6
+    %table.table.table-striped
+      %tr
+        %td
+          %strong= t('switchboards.show.name') + ":"
+        %td
+          = @switchboard.name
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @user, :child => @switchboard }
\ No newline at end of file
-- 
cgit v1.2.3


From 6374c0b3e38dfc74eb1b4a5a1fcc5229eacdcaf2 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Fri, 8 Mar 2013 12:09:17 +0100
Subject: Added SwitchboardEntry scaffold. switchboard has_many
 switchboard_entries

---
 app/assets/javascripts/switchboard_entry.js.coffee |  6 ++
 app/assets/stylesheets/application.css             |  1 +
 .../stylesheets/switchboard_entries.css.scss       |  5 ++
 app/controllers/switchboard_entries_controller.rb  | 74 ++++++++++++++++++++++
 app/helpers/switchboard_entries_helper.rb          |  2 +
 app/models/sip_account.rb                          |  2 +
 app/models/switchboard.rb                          |  2 +
 app/models/switchboard_entry.rb                    | 30 +++++++++
 app/views/switchboard_entries/_form.html.haml      |  7 ++
 app/views/switchboard_entries/_form_core.html.haml |  3 +
 .../switchboard_entries/_index_core.html.haml      | 16 +++++
 app/views/switchboard_entries/edit.html.haml       |  3 +
 app/views/switchboard_entries/index.html.haml      |  6 ++
 app/views/switchboard_entries/new.html.haml        |  3 +
 app/views/switchboard_entries/show.html.haml       | 22 +++++++
 15 files changed, 182 insertions(+)
 create mode 100644 app/assets/javascripts/switchboard_entry.js.coffee
 create mode 100644 app/assets/stylesheets/switchboard_entries.css.scss
 create mode 100644 app/controllers/switchboard_entries_controller.rb
 create mode 100644 app/helpers/switchboard_entries_helper.rb
 create mode 100644 app/models/switchboard_entry.rb
 create mode 100644 app/views/switchboard_entries/_form.html.haml
 create mode 100644 app/views/switchboard_entries/_form_core.html.haml
 create mode 100644 app/views/switchboard_entries/_index_core.html.haml
 create mode 100644 app/views/switchboard_entries/edit.html.haml
 create mode 100644 app/views/switchboard_entries/index.html.haml
 create mode 100644 app/views/switchboard_entries/new.html.haml
 create mode 100644 app/views/switchboard_entries/show.html.haml

(limited to 'app')

diff --git a/app/assets/javascripts/switchboard_entry.js.coffee b/app/assets/javascripts/switchboard_entry.js.coffee
new file mode 100644
index 0000000..d14825e
--- /dev/null
+++ b/app/assets/javascripts/switchboard_entry.js.coffee
@@ -0,0 +1,6 @@
+jQuery ->
+  $('#switchboard_entries').sortable
+    axis: 'y'
+    handle: '.handle'
+    update: ->
+      $.post($(this).data('update-url'), $(this).sortable('serialize'))
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 44868e4..557bbda 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -16,4 +16,5 @@
  *= require softkeys
  *= require phone_numbers
  *= require route_elements
+ *= require switchboard_entries
  */
diff --git a/app/assets/stylesheets/switchboard_entries.css.scss b/app/assets/stylesheets/switchboard_entries.css.scss
new file mode 100644
index 0000000..12b67ee
--- /dev/null
+++ b/app/assets/stylesheets/switchboard_entries.css.scss
@@ -0,0 +1,5 @@
+#switchboard_entries .handle {
+  font-size: 12px;
+  color: #777;
+  cursor: move;
+}
\ No newline at end of file
diff --git a/app/controllers/switchboard_entries_controller.rb b/app/controllers/switchboard_entries_controller.rb
new file mode 100644
index 0000000..ef6c72e
--- /dev/null
+++ b/app/controllers/switchboard_entries_controller.rb
@@ -0,0 +1,74 @@
+class SwitchboardEntriesController < ApplicationController
+  load_and_authorize_resource :switchboard
+  authorize_resource :switchboard_entry, :through => :switchboard, :except => [:sort]
+
+  def index
+    @switchboard_entries = @switchboard.switchboard_entries
+    spread_breadcrumbs
+  end
+
+  def show
+    @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
+    spread_breadcrumbs
+  end
+
+  def new
+    @switchboard_entry = @switchboard.switchboard_entries.build
+    @sip_accounts = SipAccount.all - @switchboard.sip_accounts
+    spread_breadcrumbs
+  end
+
+  def create
+    @switchboard_entry = @switchboard.switchboard_entries.build(switchboard_entry_params)
+    spread_breadcrumbs
+    if @switchboard_entry.save
+      redirect_to switchboard_switchboard_entries_path(@switchboard), :notice => t('switchboard_entries.controller.successfuly_created')
+    else
+      render :new
+    end
+  end
+
+  def edit
+    @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
+    @sip_accounts = SipAccount.all - @switchboard.sip_accounts + [@switchboard_entry.sip_account]
+    spread_breadcrumbs
+  end
+
+  def update
+    @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
+    if @switchboard_entry.update_attributes(switchboard_entry_params)
+      redirect_to [@switchboard, @switchboard_entry], :notice  => t('switchboard_entries.controller.successfuly_updated')
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @switchboard_entry = @switchboard.switchboard_entries.find(params[:id])
+    @switchboard_entry.destroy
+    redirect_to switchboard_switchboard_entries_path(@switchboard), :notice => t('switchboard_entries.controller.successfuly_destroyed')
+  end
+
+  def sort
+    params[:switchboard_entry].reverse.each do |id|
+      @switchboard.switchboard_entries.find(id).move_to_top
+    end
+    render nothing: true
+  end
+
+  private
+  def switchboard_entry_params
+    params.require(:switchboard_entry).permit(:name, :sip_account_id)
+  end
+
+  def spread_breadcrumbs
+    add_breadcrumb t("users.index.page_title"), tenant_users_path(@switchboard.user.current_tenant)
+    add_breadcrumb @switchboard.user, tenant_user_path(@switchboard.user.current_tenant, @switchboard.user)
+    add_breadcrumb t("switchboards.index.page_title"), user_switchboards_path(@switchboard.user)
+    add_breadcrumb @switchboard, user_switchboard_path(@switchboard.user, @switchboard)
+    add_breadcrumb t("switchboard_entries.index.page_title"), switchboard_switchboard_entries_path(@switchboard)
+    if @switchboard_entry && !@switchboard_entry.new_record?
+      add_breadcrumb @switchboard_entry, switchboard_switchboard_entries_path(@switchboard, @switchboard_entry)
+    end
+  end   
+end
diff --git a/app/helpers/switchboard_entries_helper.rb b/app/helpers/switchboard_entries_helper.rb
new file mode 100644
index 0000000..ca9b1f9
--- /dev/null
+++ b/app/helpers/switchboard_entries_helper.rb
@@ -0,0 +1,2 @@
+module SwitchboardEntriesHelper
+end
diff --git a/app/models/sip_account.rb b/app/models/sip_account.rb
index cdb609d..74a2562 100644
--- a/app/models/sip_account.rb
+++ b/app/models/sip_account.rb
@@ -41,6 +41,8 @@ class SipAccount < ActiveRecord::Base
   has_many :call_legs, :class_name => 'Call'
   has_many :b_call_legs, :class_name => 'Call', :foreign_key => 'b_sip_account_id'
 
+  has_many :switchboard_entries, :dependent => :destroy
+
   # Delegations:
   #
   delegate :host, :to => :sip_domain, :allow_nil => true
diff --git a/app/models/switchboard.rb b/app/models/switchboard.rb
index cb0c70f..74e2767 100644
--- a/app/models/switchboard.rb
+++ b/app/models/switchboard.rb
@@ -7,6 +7,8 @@ class Switchboard < ActiveRecord::Base
             :uniqueness => {:scope => :user_id}
 
   belongs_to :user, :touch => true
+  has_many :switchboard_entries, :dependent => :destroy
+  has_many :sip_accounts, :through => :switchboard_entries
 
   def to_s
     self.name.to_s
diff --git a/app/models/switchboard_entry.rb b/app/models/switchboard_entry.rb
new file mode 100644
index 0000000..d1e9a0c
--- /dev/null
+++ b/app/models/switchboard_entry.rb
@@ -0,0 +1,30 @@
+class SwitchboardEntry < ActiveRecord::Base
+  # https://github.com/rails/strong_parameters
+  include ActiveModel::ForbiddenAttributesProtection
+
+  belongs_to :switchboard, :touch => true
+  belongs_to :sip_account, :touch => true
+
+  validates :switchboard,
+            :presence => true
+
+  validates :sip_account,
+            :presence => true
+
+  validates :name,
+            :uniqueness => {:scope => :switchboard_id},
+            :allow_blank => true,
+            :allow_nil => true
+
+  acts_as_list :scope => [ :switchboard_id ]
+
+  default_scope order(:position)
+
+  def to_s
+    if self.name.blank? && !self.sip_account.to_s.blank?
+      self.sip_account.to_s
+    else
+      self.name.to_s
+    end
+  end
+end
diff --git a/app/views/switchboard_entries/_form.html.haml b/app/views/switchboard_entries/_form.html.haml
new file mode 100644
index 0000000..b3d56ec
--- /dev/null
+++ b/app/views/switchboard_entries/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for([@switchboard, @switchboard_entry]) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .form-actions
+    = f.button :submit, conditional_t('switchboard_entries.form.submit')
diff --git a/app/views/switchboard_entries/_form_core.html.haml b/app/views/switchboard_entries/_form_core.html.haml
new file mode 100644
index 0000000..6f340c2
--- /dev/null
+++ b/app/views/switchboard_entries/_form_core.html.haml
@@ -0,0 +1,3 @@
+.inputs
+  = f.association :sip_account, :collection => @sip_accounts, :label => t('switchboard_entries.form.sip_account_id.label'), :hint => conditional_hint('switchboard_entries.form.sip_account_id.hint'), :autofocus => true, :include_blank => false
+  = f.input :name, :label => t('switchboard_entries.form.name.label'), :hint => conditional_hint('switchboard_entries.form.name.hint')
diff --git a/app/views/switchboard_entries/_index_core.html.haml b/app/views/switchboard_entries/_index_core.html.haml
new file mode 100644
index 0000000..406db71
--- /dev/null
+++ b/app/views/switchboard_entries/_index_core.html.haml
@@ -0,0 +1,16 @@
+%table.table.table-striped
+  %tr
+    %th
+    %th= t('switchboard_entries.index.sip_account_id')
+    %th= t('switchboard_entries.index.name')
+    %th
+
+  %tbody{ :id => "switchboard_entries", :'data-update-url' => sort_switchboard_switchboard_entries_path(switchboard_entries.first.switchboard) }
+    - for switchboard_entry in switchboard_entries
+      = content_tag_for :tr, switchboard_entry do
+        %td
+          %span.handle
+            %i.icon-resize-vertical
+        %td= switchboard_entry.sip_account
+        %td= switchboard_entry.name
+        =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => switchboard_entry.switchboard, :child => switchboard_entry}
\ No newline at end of file
diff --git a/app/views/switchboard_entries/edit.html.haml b/app/views/switchboard_entries/edit.html.haml
new file mode 100644
index 0000000..8885e25
--- /dev/null
+++ b/app/views/switchboard_entries/edit.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("switchboard_entries.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/switchboard_entries/index.html.haml b/app/views/switchboard_entries/index.html.haml
new file mode 100644
index 0000000..302b778
--- /dev/null
+++ b/app/views/switchboard_entries/index.html.haml
@@ -0,0 +1,6 @@
+- content_for :title, t("switchboard_entries.index.page_title")
+
+- if @switchboard_entries && @switchboard_entries.count > 0
+  = render "index_core", :switchboard_entries => @switchboard_entries
+
+= render :partial => 'shared/create_link', :locals => {:parent => @switchboard, :child_class => SwitchboardEntry}
\ No newline at end of file
diff --git a/app/views/switchboard_entries/new.html.haml b/app/views/switchboard_entries/new.html.haml
new file mode 100644
index 0000000..0801a65
--- /dev/null
+++ b/app/views/switchboard_entries/new.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("switchboard_entries.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/switchboard_entries/show.html.haml b/app/views/switchboard_entries/show.html.haml
new file mode 100644
index 0000000..b519781
--- /dev/null
+++ b/app/views/switchboard_entries/show.html.haml
@@ -0,0 +1,22 @@
+- content_for :title, t("switchboard_entries.show.page_title")
+
+.row
+  .span6
+    %table.table.table-striped
+      %tr
+        %td
+          %strong= t('switchboard_entries.show.sip_account_id') + ":"
+        %td
+          = @switchboard_entry.sip_account
+      %tr
+        %td
+          %strong= t('switchboard_entries.show.name') + ":"
+        %td
+          = @switchboard_entry.name
+      %tr
+        %td
+          %strong= t('switchboard_entries.show.position') + ":"
+        %td
+          = @switchboard_entry.position
+
+    = render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @switchboard, :child => @switchboard_entry }
\ No newline at end of file
-- 
cgit v1.2.3


From 21d0843117c0962bd962fc50fccaf276a5b3067f Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 08:43:23 +0100
Subject: Misc

---
 app/models/switchboard_entry.rb       |  1 +
 app/views/switchboards/show.html.haml | 53 ++++++++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 10 deletions(-)

(limited to 'app')

diff --git a/app/models/switchboard_entry.rb b/app/models/switchboard_entry.rb
index d1e9a0c..76d002f 100644
--- a/app/models/switchboard_entry.rb
+++ b/app/models/switchboard_entry.rb
@@ -12,6 +12,7 @@ class SwitchboardEntry < ActiveRecord::Base
             :presence => true
 
   validates :name,
+            :length => { :maximum => 10 },
             :uniqueness => {:scope => :switchboard_id},
             :allow_blank => true,
             :allow_nil => true
diff --git a/app/views/switchboards/show.html.haml b/app/views/switchboards/show.html.haml
index 746e180..b81980c 100644
--- a/app/views/switchboards/show.html.haml
+++ b/app/views/switchboards/show.html.haml
@@ -1,12 +1,45 @@
-- content_for :title, t("switchboards.show.page_title")
+- content_for :title, @switchboard.name
+
 
 .row
-  .span6
-    %table.table.table-striped
-      %tr
-        %td
-          %strong= t('switchboards.show.name') + ":"
-        %td
-          = @switchboard.name
-
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @user, :child => @switchboard }
\ No newline at end of file
+  .span12
+    .well.pull-right
+      %p
+        =current_user
+
+    %ul.thumbnails
+      - @switchboard.switchboard_entries.each do |switchboard_entry|
+        %li.span1
+          %div.thumbnail
+            %a.thumbnail{:href => tenant_user_path(switchboard_entry.sip_account.sip_accountable.current_tenant, switchboard_entry.sip_account.sip_accountable)}
+              - if switchboard_entry.sip_account.sip_accountable.image?
+                = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:mini).to_s, :class => 'img-rounded')
+              - else
+                - if switchboard_entry.sip_account.sip_accountable.male?
+                  = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
+                - else
+                  = image_tag 'icons/user-female-16x.png', :class => 'img-rounded'
+            %p
+              %small
+                = truncate(switchboard_entry.to_s, :length => 10)
+                %span{:class => "label #{(switchboard_entry.sip_account.registration ? '' : 'label-inverse')}"}
+                  - if !switchboard_entry.sip_account.registration
+                    %i.icon-ban-circle.icon-white
+                  - if switchboard_entry.sip_account.phone_numbers.count > 1
+                    - phone_numbers = []
+                    - switchboard_entry.sip_account.phone_numbers.order(:position).each do |phone_number|
+                      - if phone_number.number.length < 6
+                        - phone_numbers << phone_number
+                    - if phone_numbers.size == 0
+                      - phone_numbers = switchboard_entry.sip_account.phone_numbers.order(:position)
+                  - else
+                    - phone_numbers = switchboard_entry.sip_account.phone_numbers
+                  = render 'phone_numbers/listing', :phone_numbers => phone_numbers
+
+- if can? :edit, @switchboard
+  .row
+    .span12
+      %a.btn.btn-small.btn-warning{:href => switchboard_switchboard_entries_path(@switchboard) }
+        %i.icon-edit.icon-white
+        %span.hidden-phone
+          =t("switchboard_entries.index.page_title")
-- 
cgit v1.2.3


From fc9b8e69e74a76d6727d5ddceebb018782027b16 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 08:57:50 +0100
Subject: Added Private Pub stuff. https://github.com/ryanb/private_pub

---
 app/assets/javascripts/application.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c6f4107..68a6e22 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,4 +13,5 @@
 //= require jquery
 //= require jquery-ui
 //= require jquery_ujs
+//= require private_pub
 //= require_tree .
-- 
cgit v1.2.3


From 04730ba7acf55ed5310352eabf3876bf5b8d1f87 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 09:52:08 +0100
Subject: Set the Ability for Switchboard and SwitchboardEntry.

---
 app/models/ability.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app')

diff --git a/app/models/ability.rb b/app/models/ability.rb
index fe67547..2dd96b8 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -183,6 +183,11 @@ class Ability
           #
           can :manage, VoicemailMessage
           can :manage, VoicemailSetting
+
+          # Switchboard
+          #
+          can :read, Switchboard, :id => user.switchboard_ids
+          can :read, SwitchboardEntry, :switchboard_id => user.switchboard_ids
         end
       end
     else
-- 
cgit v1.2.3


From 13e16223977966f9751e7b8e3fb587e2df0a0801 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 09:52:31 +0100
Subject: Add a second configuration option.

---
 app/views/switchboards/edit.html.haml   | 11 ++++++++++-
 app/views/users/_switchboards.html.haml |  7 +++++++
 app/views/users/show.html.haml          |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/views/users/_switchboards.html.haml

(limited to 'app')

diff --git a/app/views/switchboards/edit.html.haml b/app/views/switchboards/edit.html.haml
index 1ab0efe..f2e69f4 100644
--- a/app/views/switchboards/edit.html.haml
+++ b/app/views/switchboards/edit.html.haml
@@ -1,3 +1,12 @@
 - content_for :title, t("switchboards.edit.page_title")
 
-= render "form"
\ No newline at end of file
+.row
+  .span12
+    = render "form"
+
+.row
+  .span12
+    - if @switchboard.switchboard_entries && @switchboard.switchboard_entries.count > 0
+      = render "switchboard_entries/index_core", :switchboard_entries => @switchboard.switchboard_entries
+
+    = render :partial => 'shared/create_link', :locals => {:parent => @switchboard, :child_class => SwitchboardEntry}
\ No newline at end of file
diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml
new file mode 100644
index 0000000..f79d6b8
--- /dev/null
+++ b/app/views/users/_switchboards.html.haml
@@ -0,0 +1,7 @@
+-# Switchboards
+-#
+- if (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard )
+  %h2= t('switchboards.index.page_title')
+  - if can?( :index, Switchboard ) && user.switchboards.count > 0
+    = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user}
+  = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Conference}
\ No newline at end of file
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index ea90ab4..98f7cc6 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -87,3 +87,6 @@
 
     - cache(['user_show_conferences_overview', I18n.locale, @user, @user.conferences]) do
       = render :partial => 'conferences', :locals => {:user => @user}
+
+    - cache(['user_switchboards_overview', I18n.locale, @user, @user.switchboards]) do
+      = render :partial => 'switchboards', :locals => {:user => @user}
\ No newline at end of file
-- 
cgit v1.2.3


From c563859fa60defd2b40f17a0b7cf1c4912f72792 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 12:06:06 +0100
Subject: added non_e164_phone_numbers method

---
 app/models/sip_account.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app')

diff --git a/app/models/sip_account.rb b/app/models/sip_account.rb
index 930069d..cea5f0e 100644
--- a/app/models/sip_account.rb
+++ b/app/models/sip_account.rb
@@ -213,6 +213,11 @@ class SipAccount < ActiveRecord::Base
     return states
   end
 
+  def non_e164_phone_numbers
+    array_of_phone_numbers_as_strings = self.phone_numbers.map{ |phone_number| phone_number.number.to_s }.sort
+    self.phone_numbers.where(:number => array_of_phone_numbers_as_strings.select { |phone_number| phone_number[0] != '+' })
+  end
+
   private
       
   def save_value_of_to_s
-- 
cgit v1.2.3


From f0932e38b890b08397020a5994ddde7110d7b8db Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 10:50:49 +0100
Subject: refactoring

---
 app/controllers/switchboards_controller.rb         |  1 +
 .../_switchboard_entry.html.haml                   | 26 +++++++++++++++++++
 app/views/switchboards/show.html.haml              | 29 +---------------------
 3 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 app/views/switchboard_entries/_switchboard_entry.html.haml

(limited to 'app')

diff --git a/app/controllers/switchboards_controller.rb b/app/controllers/switchboards_controller.rb
index 8f21d5e..98008c1 100644
--- a/app/controllers/switchboards_controller.rb
+++ b/app/controllers/switchboards_controller.rb
@@ -9,6 +9,7 @@ class SwitchboardsController < ApplicationController
 
   def show
     @switchboard = @user.switchboards.find(params[:id])
+    @switchboard_entries = @switchboard.switchboard_entries
     spread_breadcrumbs
   end
 
diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
new file mode 100644
index 0000000..2902a83
--- /dev/null
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -0,0 +1,26 @@
+%li.span1{:id => "switchboard_entry_id_#{switchboard_entry.id}"}
+  %div.thumbnail
+    %a.thumbnail{:href => tenant_user_path(switchboard_entry.sip_account.sip_accountable.current_tenant, switchboard_entry.sip_account.sip_accountable)}
+      - if switchboard_entry.sip_account.sip_accountable.image?
+        = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:mini).to_s, :class => 'img-rounded')
+      - else
+        - if switchboard_entry.sip_account.sip_accountable.male?
+          = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
+        - else
+          = image_tag 'icons/user-female-16x.png', :class => 'img-rounded'
+    %p
+      %small
+        = truncate(switchboard_entry.to_s, :length => 10)
+        %span{:class => "label #{(switchboard_entry.sip_account.registration ? '' : 'label-inverse')}"}
+          - if !switchboard_entry.sip_account.registration
+            %i.icon-ban-circle.icon-white
+          - if switchboard_entry.sip_account.phone_numbers.count > 1
+            - phone_numbers = []
+            - switchboard_entry.sip_account.phone_numbers.order(:position).each do |phone_number|
+              - if phone_number.number.length < 6
+                - phone_numbers << phone_number
+            - if phone_numbers.size == 0
+              - phone_numbers = switchboard_entry.sip_account.phone_numbers.order(:position)
+          - else
+            - phone_numbers = switchboard_entry.sip_account.phone_numbers
+          = render 'phone_numbers/listing', :phone_numbers => phone_numbers
diff --git a/app/views/switchboards/show.html.haml b/app/views/switchboards/show.html.haml
index b81980c..18671c2 100644
--- a/app/views/switchboards/show.html.haml
+++ b/app/views/switchboards/show.html.haml
@@ -1,6 +1,5 @@
 - content_for :title, @switchboard.name
 
-
 .row
   .span12
     .well.pull-right
@@ -8,33 +7,7 @@
         =current_user
 
     %ul.thumbnails
-      - @switchboard.switchboard_entries.each do |switchboard_entry|
-        %li.span1
-          %div.thumbnail
-            %a.thumbnail{:href => tenant_user_path(switchboard_entry.sip_account.sip_accountable.current_tenant, switchboard_entry.sip_account.sip_accountable)}
-              - if switchboard_entry.sip_account.sip_accountable.image?
-                = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:mini).to_s, :class => 'img-rounded')
-              - else
-                - if switchboard_entry.sip_account.sip_accountable.male?
-                  = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
-                - else
-                  = image_tag 'icons/user-female-16x.png', :class => 'img-rounded'
-            %p
-              %small
-                = truncate(switchboard_entry.to_s, :length => 10)
-                %span{:class => "label #{(switchboard_entry.sip_account.registration ? '' : 'label-inverse')}"}
-                  - if !switchboard_entry.sip_account.registration
-                    %i.icon-ban-circle.icon-white
-                  - if switchboard_entry.sip_account.phone_numbers.count > 1
-                    - phone_numbers = []
-                    - switchboard_entry.sip_account.phone_numbers.order(:position).each do |phone_number|
-                      - if phone_number.number.length < 6
-                        - phone_numbers << phone_number
-                    - if phone_numbers.size == 0
-                      - phone_numbers = switchboard_entry.sip_account.phone_numbers.order(:position)
-                  - else
-                    - phone_numbers = switchboard_entry.sip_account.phone_numbers
-                  = render 'phone_numbers/listing', :phone_numbers => phone_numbers
+      = render :partial => "switchboard_entries/switchboard_entry", :collection => @switchboard_entries
 
 - if can? :edit, @switchboard
   .row
-- 
cgit v1.2.3


From 63339834ec520efae48f16f4d16b90d74e7bcdfd Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 12:36:25 +0100
Subject: Added labels with the current status.

---
 .../_switchboard_entry.html.haml                   | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
index 2902a83..5608757 100644
--- a/app/views/switchboard_entries/_switchboard_entry.html.haml
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -11,16 +11,22 @@
     %p
       %small
         = truncate(switchboard_entry.to_s, :length => 10)
-        %span{:class => "label #{(switchboard_entry.sip_account.registration ? '' : 'label-inverse')}"}
-          - if !switchboard_entry.sip_account.registration
+        %br
+        - if !switchboard_entry.sip_account.registration
+          %span.label.label-inverse
             %i.icon-ban-circle.icon-white
-          - if switchboard_entry.sip_account.phone_numbers.count > 1
-            - phone_numbers = []
-            - switchboard_entry.sip_account.phone_numbers.order(:position).each do |phone_number|
-              - if phone_number.number.length < 6
-                - phone_numbers << phone_number
-            - if phone_numbers.size == 0
-              - phone_numbers = switchboard_entry.sip_account.phone_numbers.order(:position)
-          - else
-            - phone_numbers = switchboard_entry.sip_account.phone_numbers
-          = render 'phone_numbers/listing', :phone_numbers => phone_numbers
+        - else
+          - if switchboard_entry.sip_account.call_legs(:where => ["HELD", "ACTIVE"]).size != 0
+            %span.label.label-success
+              %i.icon-user.icon-white    
+          - if switchboard_entry.sip_account.call_legs(:where => ["RINGING"]).size != 0
+            %span.label.label-info
+              %i.icon-bell.icon-white    
+        - if switchboard_entry.sip_account.non_e164_phone_numbers.size == 0
+          - phone_numbers = switchboard_entry.sip_account.phone_numbers
+        - else 
+          - phone_numbers = switchboard_entry.sip_account.non_e164_phone_numbers
+
+        - phone_numbers.each do |phone_number|
+          %span.label
+            = phone_number.number
-- 
cgit v1.2.3


From b29f5e637816aeca6f5cc7c9acb3f380469d1630 Mon Sep 17 00:00:00 2001
From: Julian Pawlowski <julian.pawlowski@gmail.com>
Date: Sun, 10 Mar 2013 14:33:40 +0100
Subject: fix link

---
 app/views/users/_switchboards.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml
index f79d6b8..8dca15f 100644
--- a/app/views/users/_switchboards.html.haml
+++ b/app/views/users/_switchboards.html.haml
@@ -4,4 +4,4 @@
   %h2= t('switchboards.index.page_title')
   - if can?( :index, Switchboard ) && user.switchboards.count > 0
     = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user}
-  = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Conference}
\ No newline at end of file
+  = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Switchboard}
\ No newline at end of file
-- 
cgit v1.2.3


From b9aeac77779f7a9ae0e51b8d95adc7d542e09ece Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 18:32:13 +0100
Subject: Small fixes.

---
 app/views/switchboard_entries/_index_core.html.haml   | 19 ++++++++++---------
 .../switchboard_entries/_switchboard_entry.html.haml  | 11 +++--------
 app/views/users/_switchboards.html.haml               |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'app')

diff --git a/app/views/switchboard_entries/_index_core.html.haml b/app/views/switchboard_entries/_index_core.html.haml
index 406db71..d647626 100644
--- a/app/views/switchboard_entries/_index_core.html.haml
+++ b/app/views/switchboard_entries/_index_core.html.haml
@@ -5,12 +5,13 @@
     %th= t('switchboard_entries.index.name')
     %th
 
-  %tbody{ :id => "switchboard_entries", :'data-update-url' => sort_switchboard_switchboard_entries_path(switchboard_entries.first.switchboard) }
-    - for switchboard_entry in switchboard_entries
-      = content_tag_for :tr, switchboard_entry do
-        %td
-          %span.handle
-            %i.icon-resize-vertical
-        %td= switchboard_entry.sip_account
-        %td= switchboard_entry.name
-        =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => switchboard_entry.switchboard, :child => switchboard_entry}
\ No newline at end of file
+  - if switchboard_entries.any?
+    %tbody{ :id => "switchboard_entries", :'data-update-url' => sort_switchboard_switchboard_entries_path(switchboard_entries.first.switchboard) }
+      - for switchboard_entry in switchboard_entries
+        = content_tag_for :tr, switchboard_entry do
+          %td
+            %span.handle
+              %i.icon-resize-vertical
+          %td= switchboard_entry.sip_account
+          %td= switchboard_entry.name
+          =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => switchboard_entry.switchboard, :child => switchboard_entry}
\ No newline at end of file
diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
index 5608757..8d8e747 100644
--- a/app/views/switchboard_entries/_switchboard_entry.html.haml
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -21,12 +21,7 @@
               %i.icon-user.icon-white    
           - if switchboard_entry.sip_account.call_legs(:where => ["RINGING"]).size != 0
             %span.label.label-info
-              %i.icon-bell.icon-white    
-        - if switchboard_entry.sip_account.non_e164_phone_numbers.size == 0
-          - phone_numbers = switchboard_entry.sip_account.phone_numbers
-        - else 
-          - phone_numbers = switchboard_entry.sip_account.non_e164_phone_numbers
-
-        - phone_numbers.each do |phone_number|
+              %i.icon-bell.icon-white
+        - if switchboard_entry.sip_account.phone_numbers.any?
           %span.label
-            = phone_number.number
+            = switchboard_entry.sip_account.phone_numbers.first.number        
diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml
index 8dca15f..183b6ae 100644
--- a/app/views/users/_switchboards.html.haml
+++ b/app/views/users/_switchboards.html.haml
@@ -1,6 +1,6 @@
 -# Switchboards
 -#
-- if (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard )
+- if SipAccount.any? && (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard )
   %h2= t('switchboards.index.page_title')
   - if can?( :index, Switchboard ) && user.switchboards.count > 0
     = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user}
-- 
cgit v1.2.3


From beb9e66a5b4e2744435f2c1f301828b68a58c96a Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 19:11:13 +0100
Subject: Indicate a new voicemail in the navigation bar.

---
 app/controllers/trigger_controller.rb   | 4 ++++
 app/views/layouts/_navbar.html.haml     | 4 ++++
 app/views/layouts/application.html.haml | 1 +
 app/views/trigger/voicemail.html.erb    | 4 ----
 4 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 app/views/trigger/voicemail.html.erb

(limited to 'app')

diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 5e836c4..1a5bfca 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -42,6 +42,10 @@ class TriggerController < ApplicationController
           end
         end
 
+        # Indicate a new voicemail in the navigation bar.
+        #
+        PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_indicator').hide.delay(250).show('slow').hide.delay(250).show('slow');")
+
         render(
           :status => 200,
           :layout => false,
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index 8004c0e..fe5f48f 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -22,7 +22,11 @@
                 =t("call_histories.index.page_title")
             %li
               %a{:href => sip_account_voicemail_messages_path(current_user.sip_accounts.first)}
+                %i.icon-star.icon-white{:id => 'new_voicemail_indicator'}
                 =t("voicemail_messages.index.page_title")
+            :javascript
+              $("#new_voicemail_indicator").hide()
+            = subscribe_to "/users/#{current_user.id}/messages/new"   
 
       - if current_user
         %ul.nav.pull-right
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index eab6096..027f837 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -36,4 +36,5 @@
         .span12
           %hr/
           = render 'layouts/footer'
+
     / /container
diff --git a/app/views/trigger/voicemail.html.erb b/app/views/trigger/voicemail.html.erb
deleted file mode 100644
index 9bafe17..0000000
--- a/app/views/trigger/voicemail.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1>Trigger#voicemail</h1>
-<p>Find me in app/views/trigger/voicemail.html.erb</p>
-
-<%= debug(params) %>
-- 
cgit v1.2.3