Merge branch 'hotfix/2.13.3'

lost_tracker/blueprint/group.py

@@ -55,14 +55,16 @@ def save_info(id):
             return gettext("Access Denied!"), 403
 
     # attributes that don't require admin permissions.
+    num_vegetarians = request.form.get('num_vegetarians', 0)
+    num_participants = request.form.get('num_participants', 0)
     data = {
         'name': request.form['name'],
         'phone': request.form['phone'],
         'comments': request.form['comments'],
         'contact': request.form['contact'],
         'email': request.form.get('email', ''),
-        'num_vegetarians': int(request.form.get('num_vegetarians', 0)),
-        'num_participants': int(request.form.get('num_participants', 0)),
+        'num_vegetarians': int(num_vegetarians) if num_vegetarians else 0,
+        'num_participants': int(num_participants) if num_participants else 0,
         'send_email': True,
         'notification_recipient': 'admins',
         'user_is_admin': False,
@@ -141,6 +143,7 @@ def list():
 
 
 @GROUP.route('/<name>')
+@roles_accepted(mdl.Role.STAFF, mdl.Role.ADMIN)
 def edit(name):
     group = mdl.Group.one(name=name)
     if not group:

lost_tracker/blueprint/root.py

@@ -117,15 +117,19 @@ def convert_markdown(value):
 
 @ROOT.app_template_filter('avatar_url')
 def fetch_avatar_url(user):
-    if not user.social_connections:
-        mailhash = md5(user.email.lower()).hexdigest()
-        gravatar = 'http://www.gravatar.com/avatar/%s?d=identicon' % mailhash
-        return gravatar
-    first_social = user.social_connections[0]
-    if first_social.provider_id == 'facebook':
-        return fb.get_image_url(first_social)
-    else:
-        return first_social.image_url
+    # Use gravatar as default
+    mailhash = md5(user.email.lower()).hexdigest()
+    gravatar = 'http://www.gravatar.com/avatar/%s?d=identicon' % mailhash
+    social_link = ''
+
+    if user.social_connections:
+        first_social = user.social_connections[0]
+        if first_social.provider_id == 'facebook':
+            social_link = fb.get_image_url(first_social)
+        else:
+            social_link = first_social.image_url
+
+    return social_link or gravatar
 
 
 @ROOT.app_template_filter('humantime')

lost_tracker/fbhelper.py

@@ -1,3 +1,8 @@
+import logging
+
+LOG = logging.getLogger(__name__)
+
+
 def get_email(oauth_response):
     from facebook import GraphAPI
     api = GraphAPI(access_token=oauth_response['access_token'], version='2.5')
@@ -8,7 +13,12 @@ def get_email(oauth_response):
 def get_image_url(connection):
     from facebook import GraphAPI
     api = GraphAPI(access_token=connection.access_token, version='2.5')
-    response = api.request('/%s/picture' % connection.provider_user_id,
-                           args={'redirect': '1',
-                                 'type': 'large'})
-    return 'data:%s;base64,%s' % (response['mime-type'], response['data'].encode('base64'))
+    try:
+        response = api.request('/%s/picture' % connection.provider_user_id,
+                               args={'redirect': '1',
+                                     'type': 'large'})
+        return 'data:%s;base64,%s' % (response['mime-type'],
+                                      response['data'].encode('base64'))
+    except Exception as exc:
+        LOG.error(exc, exc_info=True)
+        return ''

lost_tracker/templates/edit_group.html

@@ -25,7 +25,7 @@ <h1>{{group.name}}&nbsp;<small><a href="{{url_for('group.show_comments', id=grou
       <dt>{{_('Contact')}}</dt>
       <dd><input type="text" name="contact" value="{{group.contact}}" /></dd>
       <dt>{{_('Email')}}</dt>
-      <dd><input type="email" name="email" value="{{group.email}}" /></dd>
+      <dd><input type="email" name="email" value="{{group.email|default('', True)}}" /></dd>
       <dt>{{_('Phone')}}</dt>
       <dd><input type="text" name="phone" value="{{group.phone}}" /></dd>
       <dt>{{_('Total number of participants (including vegetarians)')}}</dt>

lost_tracker/templates/master_framed.html

@@ -8,9 +8,9 @@
 
 {% macro avatar(user, size) -%}
   {% if user and user.social_connections and user.social_connections[0].image_url -%}
-    <img align="middle" width="{{size}}" height="{{size}}" class="avatar" src="{{user|avatar_url}}" alt="Avatar" />
+    <img align="middle" height="{{size}}" class="avatar" src="{{user|avatar_url}}" alt="Avatar" />
   {%- else -%}
-    <img align="middle" width="{{size}}" height="{{size}}" class="avatar" src="{{url_for('static', filename='images/generic_avatar.png')}}" alt="Avatar" />
+    <img align="middle" height="{{size}}" class="avatar" src="{{url_for('static', filename='images/generic_avatar.png')}}" alt="Avatar" />
   {%- endif %}
 {%- endmacro %}
 

lost_tracker/version.txt

@@ -1 +1 @@
-2.13.2
+2.13.3