From 170271d97d5e0eeb8e4e03e0b655927f7542b067 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 14 Mar 2020 12:45:22 +0000
Subject: [PATCH] Added WebEx room resource name, query method and template
 logic to show WebEx room resources.  - Legacy-Id: 17437

---
 ietf/meeting/models.py                        |  5 +++-
 ietf/name/fixtures/names.json                 | 10 ++++++++
 .../meeting/session_buttons_include.html      | 23 +++++++++++++------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index 60c4142fc..e3d254aad 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# Copyright The IETF Trust 2007-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
@@ -399,6 +399,9 @@ class Room(models.Model):
     def video_stream_url(self):
         urlresource = self.urlresource_set.filter(name_id__in=['meetecho', ]).first()
         return urlresource.url if urlresource else None
+    def webex_url(self):
+        urlresource = self.urlresource_set.filter(name_id__in=['webex', ]).first()
+        return urlresource.url if urlresource else None
     #
     class Meta:
         ordering = ["-id"]
diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
index 2dcb89683..0bcf700e7 100644
--- a/ietf/name/fixtures/names.json
+++ b/ietf/name/fixtures/names.json
@@ -11461,6 +11461,16 @@
     "model": "name.roomresourcename",
     "pk": "u-shape"
   },
+  {
+    "fields": {
+      "desc": "WebEx support",
+      "name": "WebEx session",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.roomresourcename",
+    "pk": "webex"
+  },
   {
     "fields": {
       "desc": "",
diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
index 12ad1a4c9..5024ab986 100644
--- a/ietf/templates/meeting/session_buttons_include.html
+++ b/ietf/templates/meeting/session_buttons_include.html
@@ -24,12 +24,7 @@
     href="xmpp:{{item.session.jabber_room_name}}@jabber.ietf.org?join"
     title="Jabber room for {{item.session.jabber_room_name}}"><span class="fa fa-lightbulb-o"></span>
   </a>
-    {% if "https://ietf.webex.com" in item.session.agenda_note|first_url %}
-	  <a class="btn btn-default btn-xs"
-	    href="{{ item.session.agenda_note|first_url }}"
-	    title="Webex session"><span class="fa fa-phone"></span>
-	  </a>
-    {% else  %}
+
 	<!-- Video stream (meetecho) -->
 	{% if item.timeslot.location.video_stream_url %}
 	  <a class="btn btn-default btn-xs"
@@ -44,7 +39,21 @@
 	    title="Audio stream"><span class="glyphicon glyphicon-headphones"></span>
 	  </a>
 	{% endif %}
-    {% endif %}	
+        <!-- WebEx -->
+        {% if "https://ietf.webex.com" in item.session.agenda_note|first_url %}
+          <a class="btn btn-default btn-xs"
+            href="{{ item.session.agenda_note|first_url }}"
+            title="Webex session"><span class="fa fa-phone"></span>
+          </a>
+        {% else  %}
+          {% if item.timeslot.location.webex_url %}
+            <a class="btn btn-default btn-xs"
+              href="{{item.timeslot.location.webex_url|format:item.session }}"
+              title="Webex session"><span class="fa fa-phone"></span>
+            </a>
+          {% endif %}
+        {% endif %}
+
 {% else %}
 
   <!-- Jabber logs -->