From 8c52e919fbf728bf2ec44a14d6a35e0f01d413b7 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 20 2016 20:49:03 +0000
Subject: [PATCH 1/3] Allow configuring the number of meeting shown in the meetings widget


---

diff --git a/hubs/widgets/meetings.py b/hubs/widgets/meetings.py
index 04e0868..faf38f6 100755
--- a/hubs/widgets/meetings.py
+++ b/hubs/widgets/meetings.py
@@ -64,7 +64,12 @@ position = 'both'
           default=None,
           validator=validators.required,
           help="A fedocal calendar.")
-def data(session, widget, calendar):
+@argument(name="n_meetings",
+          default=4,
+          validator=validators.integer,
+          help="The number of meetings to display.")
+def data(session, widget, calendar, n_meetings=4):
+    n_meetings = int(n_meetings)
     base = 'https://apps.fedoraproject.org/calendar/api/meetings/?calendar=%s'
     url = base % calendar
     response = requests.get(url).json()
@@ -82,6 +87,8 @@ def data(session, widget, calendar):
         if not selected:
             continue
         meetings[title] = selected
+        if len(meetings) >= n_meetings:
+            break
 
     return dict(meetings=meetings)
 

From 60708464a2e04cba18622a0441cf3aad732443c1 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 20 2016 20:49:03 +0000
Subject: [PATCH 2/3] Let the validator return the validated value and use it when editing a widget


---

diff --git a/hubs/app.py b/hubs/app.py
index 5a1404d..c152053 100755
--- a/hubs/app.py
+++ b/hubs/app.py
@@ -411,7 +411,7 @@ def widget_edit_post(hub, idx):
             error = True
             break
         try:
-            arg.validator(session, val)
+            val = arg.validator(session, val)
             config[arg.name] = val
         except Exception as err:
             flask.flash('Invalid data provided, error: %s' % err, 'error')
diff --git a/hubs/validators.py b/hubs/validators.py
index bdc3c96..791f3fe 100755
--- a/hubs/validators.py
+++ b/hubs/validators.py
@@ -4,7 +4,8 @@ import hubs.models
 
 
 def required(session, value):
-    return bool(value)
+    if bool(value):
+        return value
 
 
 def text(session, value):

From 889b35b32a02d11473d8581ed56a3754f283ecfb Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 20 2016 20:49:03 +0000
Subject: [PATCH 3/3] Always display the meetings widget, even if there are no coming meetings


This allows configuring the widget, for example if you made a mistake
when entering the calendar's name

---

diff --git a/hubs/widgets/meetings.py b/hubs/widgets/meetings.py
index faf38f6..071496a 100755
--- a/hubs/widgets/meetings.py
+++ b/hubs/widgets/meetings.py
@@ -54,7 +54,7 @@ def next_meeting(meetings):
 
 
 footer_template = templating.environment.get_template('templates/meeting_footer.html')
-chrome = panel(title = 'Meetings', key='meetings', footer_template=footer_template)
+chrome = panel(title='Meetings', footer_template=footer_template)
 templating.environment.filters['humanize'] = lambda d: arrow.get(d).humanize()
 template = templating.environment.get_template('templates/meetings.html')
 position = 'both'
@@ -69,7 +69,6 @@ position = 'both'
           validator=validators.integer,
           help="The number of meetings to display.")
 def data(session, widget, calendar, n_meetings=4):
-    n_meetings = int(n_meetings)
     base = 'https://apps.fedoraproject.org/calendar/api/meetings/?calendar=%s'
     url = base % calendar
     response = requests.get(url).json()
@@ -90,7 +89,10 @@ def data(session, widget, calendar, n_meetings=4):
         if len(meetings) >= n_meetings:
             break
 
-    return dict(meetings=meetings)
+    return dict(
+        calendar=calendar,
+        meetings=meetings,
+    )
 
 
 @hint(ubiquitous=True)
diff --git a/hubs/widgets/templates/meetings.html b/hubs/widgets/templates/meetings.html
index 7725729..b101c5f 100644
--- a/hubs/widgets/templates/meetings.html
+++ b/hubs/widgets/templates/meetings.html
@@ -1,4 +1,3 @@
-{% if meetings %}
 {% for title, next in meetings.items() %}
 <div class="meeting">
   <div class="row">
@@ -40,5 +39,10 @@
   {% endif  %}
 </div>
 {% if meetings | length > 1 %} <hr> {% endif %}
+{% else %}
+<div class="meeting">
+  <div class="row">
+    No coming meetings in {{ calendar }}.
+  </div>
+</div>
 {% endfor %}
-{% endif %}