Merge branch 'devel' of https://github.com/nerosketch/djing into devel

# Conflicts: # taskapp/views.py
8 years ago · d4fdc62784
1 changed files with 3 additions and 1 deletions
--- a/clientsideapp/templates/clientsideapp/services.html
+++ b/clientsideapp/templates/clientsideapp/services.html
@ -74,7 +74,9 @@
                    </div>
                </div>
            </div>
-            {% include 'clientsideapp/custom_pages/service.htm' with active_service=current_service %}
+            {% if current_service %}
+                {% include 'clientsideapp/custom_pages/service.htm' with active_service=current_service %}
+            {% endif %}
        </div>
    </div>