Merge branch 'develop' of github.com:amooma/GS5 into develop

4 files changed, 43 insertions, 19 deletions

diff --git a/app/controllers/conference_invitees_controller.rb b/app/controllers/conference_invitees_controller.rb
index e891ebc..cbe4790 100644
--- a/app/controllers/conference_invitees_controller.rb
+++ b/app/controllers/conference_invitees_controller.rb
@@ -35,10 +35,7 @@ class ConferenceInviteesController < ApplicationController
     end                            
     
     if @conference_invitee.save
-      # m = method( :"#{@parent_in_route.class.name.underscore}_path" )
-      # redirect_to m.( @parent_in_route ), :notice => t('conference_invitees.controller.successfuly_created', :resource => @conference_invitees)
-      m = method( :"#{@conference_invitee.conference.conferenceable_type.underscore}_conference_path")
-      redirect_to m.( @conference_invitee.conference.conferenceable, @conference_invitee.conference), :notice => t('conference_invitees.controller.successfuly_created', :resource => @conference_invitees)
+      redirect_to conference_conference_invitees_url(@conference), :notice => t('conference_invitees.controller.successfuly_created')
     else
       render :new
     end
@@ -50,7 +47,7 @@ class ConferenceInviteesController < ApplicationController
 
   def update
     if @conference_invitee.update_attributes(params[:conference_invitee])
-      redirect_to @conference_invitee, :notice  => t('conference_invitees.controller.successfuly_updated')
+      redirect_to conference_conference_invitees_url(@conference), :notice  => t('conference_invitees.controller.successfuly_updated')
     else
       render :edit
     end
diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb
index eb94038..ae58ab8 100644
--- a/app/controllers/config_snom_controller.rb
+++ b/app/controllers/config_snom_controller.rb
@@ -281,7 +281,30 @@ class ConfigSnomController < ApplicationController
             when 'log_in'
               @softkeys.push({:context => sip_account_index, :label => softkey.label, :data => "speed f-li-#{softkey.number}"})
             when 'conference'
-              @softkeys.push({:context => sip_account_index, :label => softkey.label, :data => "blf <sip:#{softkey.number}@#{sip_account.host}>|f-ta-"})
+              conference = softkey.softkeyable
+              if conference.class == Conference
+                @softkeys.push({
+                  :context => sip_account_index,
+                  :function => softkey.softkey_function.name,
+                  :label => softkey.label,
+                  :softkey => softkey,
+                  :general_type => t("softkeys.functions.#{softkey.softkey_function.name}"),
+                  :subscription => {
+                    :to => "sip:conference#{conference.id}@#{sip_account.host}",
+                    :for => "sip:conference#{conference.id}@#{sip_account.host}",
+                  },
+                  :actions => [{
+                    :type => :dial, 
+                    :target => "f-ta-#{softkey.number}",
+                    :when => 'on press',
+                    :states => 'connected,holding',
+                  },{
+                    :type => :dial, 
+                    :target => softkey.number,
+                    :when => 'on press',
+                  }],
+                })
+              end
             when 'parking_stall'
               parking_stall = softkey.softkeyable
               if parking_stall.class == ParkingStall
diff --git a/app/models/conference.rb b/app/models/conference.rb
index aee75d5..6c89d60 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -7,6 +7,12 @@ class Conference < ActiveRecord::Base
   has_many :conference_invitees, :dependent => :destroy
   has_many :phone_numbers, :as => :phone_numberable, :dependent => :destroy
 
+  before_validation {
+    if !self.pin.blank?
+      self.pin = self.pin.to_s.gsub(/[^0-9]/, '')
+    end
+  }
+
   validates_presence_of  :conferenceable_type, :conferenceable_id
   validates_presence_of  :conferenceable
   validates_presence_of  :name
@@ -21,15 +27,12 @@ class Conference < ActiveRecord::Base
 
   validates_inclusion_of :open_for_anybody, :in => [true, false]
   
-  validates_numericality_of :pin, :only_integer => true, 
-                                  :greater_than => 0,
-                                  :allow_nil => true,
-                                  :allow_blank => true
   validates_length_of       :pin, :minimum => (GsParameter.get('MINIMUM_PIN_LENGTH').nil? ? 4 : GsParameter.get('MINIMUM_PIN_LENGTH')),
                                   :allow_nil => true,
                                   :allow_blank => true
   
   validate :start_and_end_dates_must_make_sense, :if => Proc.new { |conference| !conference.start.blank? && !conference.end.blank? }
+
   
   before_save :send_pin_email_when_pin_has_changed
 
@@ -50,7 +53,6 @@ class Conference < ActiveRecord::Base
   private
   
   def start_and_end_dates_must_make_sense
-    errors.add(:start, 'must be in the future') if self.start < Time.now - 10.minutes
     errors.add(:end, 'must be later than the start') if self.end < self.start
   end
 
diff --git a/app/models/conference_invitee.rb b/app/models/conference_invitee.rb
index d6e3bac..6a1349e 100644
--- a/app/models/conference_invitee.rb
+++ b/app/models/conference_invitee.rb
@@ -1,21 +1,23 @@
 class ConferenceInvitee < ActiveRecord::Base
   attr_accessible :pin, :speaker, :moderator, :phone_number, :phone_number_attributes
-  
+
   belongs_to :conference
   belongs_to :phone_book_entry
   has_one :phone_number, :as => :phone_numberable, :dependent => :destroy
   accepts_nested_attributes_for :phone_number
   
+  before_validation {
+    if !self.pin.blank?
+      self.pin = self.pin.to_s.gsub(/[^0-9]/, '')
+    end
+  }
+
   validates_presence_of :conference_id
   validates_presence_of :conference
   validates_presence_of :phone_number
-  validates_numericality_of :pin, :only_integer => true, 
-                                  :greater_than => 0,
-                                  :allow_nil => true,
-                                  :allow_blank => true
-  validates_length_of       :pin, :minimum => (GsParameter.get('MINIMUM_PIN_LENGTH').nil? ? 4 : GsParameter.get('MINIMUM_PIN_LENGTH')),
-                                  :allow_nil => true,
-                                  :allow_blank => true
+  validates_length_of   :pin, :minimum => (GsParameter.get('MINIMUM_PIN_LENGTH').nil? ? 4 : GsParameter.get('MINIMUM_PIN_LENGTH')),
+                        :allow_nil => true,
+                        :allow_blank => true
                                   
   validates_inclusion_of :speaker, :in => [true, false]
   validates_inclusion_of :moderator, :in => [true, false]