Optimise approach for displaying placeholders (#2709)

Author: shubham-padia

app/__init__.py

@@ -281,6 +281,12 @@ def app_logo():
     return dict(logo=logo)
 
 
+@app.context_processor
+def app_avatar():
+    avatar = DataGetter.get_custom_placeholder_by_name('Avatar')
+    return dict(avatar=avatar)
+
+
 @app.template_filter('pretty_name')
 def pretty_name_filter(string):
     string = str(string)

app/templates/gentelella/admin/menu.html

@@ -46,18 +46,11 @@
                                     <img src="{{ current_user.user_detail.icon }}" onerror="imgError(this)"/>
                                 {% elif current_user.user_detail.avatar_uploaded %}
                                     <img src="{{ current_user.user_detail.avatar_uploaded }}" onerror="imgError(this)"/>
+                                {% elif avatar != None %}
+                                    <img src='{{ avatar.url }}'/>
                                 {% else %}
-                                    {% set vars = {'foo': False} %}
-                                    {% for custom_image in custom_placeholder %}
-                                        {% if custom_image.name == "Avatar" %}
-                                            <img src='{{ custom_image.url }}'/>
-                                            {% if vars.update({'foo': True}) %} {% endif %}
-                                        {% endif %}
-                                    {% endfor %}
-                                    {% if not vars.foo %}
-                                        <img src="{{ url_for('static', filename='placeholders/avatar.png') }}"
+                                    <img src="{{ url_for('static', filename='placeholders/avatar.png') }}"
                                              onerror="imgError(this)"/>
-                                    {% endif %}
                                 {% endif %}
                                 <span class="user-text">{{ current_user.user_detail.firstname | default(current_user.email, true) }}</span>
                                 <span class=" fa fa-angle-down"></span>

app/templates/gentelella/guest/event/base.html

@@ -8,32 +8,16 @@
 {# Set `event_image` to use inside template #}
 {% if event.background_url %}
     {% set event_image = event.background_url %}
-{% elif event.sub_topic %}
-    {% set event_image = {'status': False,'img': event_image} %}
-    {% for custom_image in custom_placeholder %}
-        {% if custom_image.name == event.sub_topic %}
-            {% if event_image.update({'status': True,'img': custom_image.url}) %} {% endif %}
-        {% endif %}
-    {% endfor %}
-    {% set event_image_status = event_image.status %}
-    {% set event_image = event_image.img %}
-    {% if not event_image_status %}
+{% elif custom_placeholder != None %}
+    {% set event_image = custom_placeholder.url %}
+{% else %}
+    {% if event.sub_topic %}
         {% set event_image = url_for("static", filename="placeholders/" + placeholder_images[event.sub_topic], _external=True) %}
-    {% endif %}
-{% elif event.topic %}
-    {% set event_image = {'status': False,'img': event_image} %}
-    {% for custom_image in custom_placeholder %}
-        {% if custom_image.name == event.topic %}
-            {% if event_image.update({'status': True,'img': custom_image.url}) %} {% endif %}
-        {% endif %}
-    {% endfor %}
-    {% set event_image_status = event_image.status %}
-    {% set event_image = event_image.img %}
-    {% if not event_image_status %}
+    {% elif event.topic %}
         {% set event_image = url_for("static", filename="placeholders/" + placeholder_images[event.topic], _external=True) %}
+    {% else %}
+        {% set event_image = url_for("static", filename="placeholders/" + placeholder_images["Other"], _external=True) %}
     {% endif %}
-{% else %}
-    {% set event_image = url_for("static", filename="placeholders/" + placeholder_images["Other"], _external=True) %}
 {% endif %}
 
 {% block head_meta %}
@@ -173,7 +157,6 @@ <h4 style="font-weight: 300;"><i class="glyphicon glyphicon-map-marker"></i> {{
         <div class="col-md-8 col-sm-8 col-xs-12 col-md-push-1 col-sm-push-2 event-info-container-holder"
              style="min-height: 600px;">
             {% block content %}
-
             {% endblock %}
         </div>
         <div class="col-md-2 col-md-push-1 hidden-xs hidden-sm">

app/views/public/event_detail.py

@@ -45,7 +45,13 @@ def display_default():
 def display_event_detail_home(identifier):
     event = get_published_event_or_abort(identifier)
     placeholder_images = DataGetter.get_event_default_images()
-    custom_placeholder = DataGetter.get_custom_placeholders()
+    if event.sub_topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.sub_topic)
+    elif event.topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.topic)
+    else:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name('Other')
+
     call_for_speakers = DataGetter.get_call_for_papers(event.id).first()
     accepted_sessions = DataGetter.get_sessions(event.id).all()
     if event.copyright:
@@ -71,7 +77,12 @@ def display_event_detail_home(identifier):
 def display_event_sessions(identifier):
     event = get_published_event_or_abort(identifier)
     placeholder_images = DataGetter.get_event_default_images()
-    custom_placeholder = DataGetter.get_custom_placeholders()
+    if event.sub_topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.sub_topic)
+    elif event.topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.topic)
+    else:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name('Other')
     if not event.has_session_speakers:
         abort(404)
     call_for_speakers = DataGetter.get_call_for_papers(event.id).first()
@@ -87,7 +98,12 @@ def display_event_sessions(identifier):
 def display_event_schedule(identifier):
     event = get_published_event_or_abort(identifier)
     placeholder_images = DataGetter.get_event_default_images()
-    custom_placeholder = DataGetter.get_custom_placeholders()
+    if event.sub_topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.sub_topic)
+    elif event.topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.topic)
+    else:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name('Other')
     if not event.has_session_speakers:
         abort(404)
     tracks = DataGetter.get_tracks(event.id)
@@ -143,7 +159,12 @@ def display_event_schedule_xcal(identifier):
 def display_event_cfs(identifier, via_hash=False):
     event = get_published_event_or_abort(identifier)
     placeholder_images = DataGetter.get_event_default_images()
-    custom_placeholder = DataGetter.get_custom_placeholders()
+    if event.sub_topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.sub_topic)
+    elif event.topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.topic)
+    else:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name('Other')
     if not event.has_session_speakers:
         abort(404)
 
@@ -179,7 +200,12 @@ def display_event_cfs_via_hash(hash):
         abort(404)
     event = DataGetter.get_event(call_for_speakers.event_id)
     placeholder_images = DataGetter.get_event_default_images()
-    custom_placeholder = DataGetter.get_custom_placeholders()
+    if event.sub_topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.sub_topic)
+    elif event.topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.topic)
+    else:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name('Other')
     if not event.has_session_speakers:
         abort(404)
 
@@ -214,7 +240,12 @@ def process_event_cfs(identifier, via_hash=False):
     if request.method == 'GET':
         event = get_published_event_or_abort(identifier)
         placeholder_images = DataGetter.get_event_default_images()
-        custom_placeholder = DataGetter.get_custom_placeholders()
+        if event.sub_topic:
+            custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.sub_topic)
+        elif event.topic:
+            custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.topic)
+        else:
+            custom_placeholder = DataGetter.get_custom_placeholder_by_name('Other')
         if not event.has_session_speakers:
             abort(404)
 
@@ -262,7 +293,12 @@ def process_event_cfs(identifier, via_hash=False):
 def display_event_coc(identifier):
     event = get_published_event_or_abort(identifier)
     placeholder_images = DataGetter.get_event_default_images()
-    custom_placeholder = DataGetter.get_custom_placeholders()
+    if event.sub_topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.sub_topic)
+    elif event.topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.topic)
+    else:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name('Other')
     call_for_speakers = DataGetter.get_call_for_papers(event.id).first()
     if not (event.code_of_conduct and event.code_of_conduct != '' and event.code_of_conduct != ' '):
         abort(404)
@@ -278,7 +314,12 @@ def display_event_coc(identifier):
 def display_event_tickets(identifier):
     event = get_published_event_or_abort(identifier)
     placeholder_images = DataGetter.get_event_default_images()
-    custom_placeholder = DataGetter.get_custom_placeholders()
+    if event.sub_topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.sub_topic)
+    elif event.topic:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name(event.topic)
+    else:
+        custom_placeholder = DataGetter.get_custom_placeholder_by_name('Other')
     if event.copyright:
         licence_details = DataGetter.get_licence_details(event.copyright.licence)
     else: