canvas_webex 0.10 → 0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/app/models/cisco_webex_conference.rb +20 -16
- data/lib/canvas_webex/version.rb +1 -1
- metadata +2 -2
|
@@ -44,7 +44,7 @@ class CiscoWebexConference < WebConference
|
|
|
44
44
|
def initiate_conference
|
|
45
45
|
unless self.conference_key.present?
|
|
46
46
|
options = {
|
|
47
|
-
duration: self.duration ||
|
|
47
|
+
duration: self.duration || 0,
|
|
48
48
|
emails: settings[:external_emails].nil? ? [] : settings[:external_emails].strip.split(';'),
|
|
49
49
|
time_zone: user.time_zone
|
|
50
50
|
}
|
|
@@ -60,24 +60,28 @@ class CiscoWebexConference < WebConference
|
|
|
60
60
|
#
|
|
61
61
|
# Returns conference status as a symbol (either :active or :closed).
|
|
62
62
|
def conference_status
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
63
|
+
begin
|
|
64
|
+
if self.started_at.nil?
|
|
65
|
+
initiate_conference if self.conference_key.blank? && scheduled_date.present?
|
|
66
|
+
:created
|
|
67
|
+
elsif self.ended_at.nil? && meeting
|
|
68
|
+
if self.end_at && self.end_at > Time.now
|
|
69
|
+
:active
|
|
70
|
+
elsif self.end_at.nil?
|
|
71
|
+
:active
|
|
72
|
+
else
|
|
73
|
+
:closed
|
|
74
|
+
end
|
|
71
75
|
else
|
|
76
|
+
unless self.ended_at
|
|
77
|
+
self.close
|
|
78
|
+
self.end_at = self.ended_at
|
|
79
|
+
self.save
|
|
80
|
+
end
|
|
72
81
|
:closed
|
|
73
82
|
end
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
self.close
|
|
77
|
-
self.end_at = self.ended_at
|
|
78
|
-
self.save
|
|
79
|
-
end
|
|
80
|
-
:closed
|
|
83
|
+
rescue CanvasWebex::ConnectionError
|
|
84
|
+
nil
|
|
81
85
|
end
|
|
82
86
|
end
|
|
83
87
|
|
data/lib/canvas_webex/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: canvas_webex
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: '0.
|
|
4
|
+
version: '0.11'
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-01-
|
|
12
|
+
date: 2014-01-10 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rake
|