From 8db00b2d7c688760288994ace9a48ecf65cdd770 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 18 2017 11:44:34 +0000
Subject: Fix the unit-tests


The logic in the template was using `and` and `or` but the logic in the
second block of that `or` was trying to access `g.fas_user` which was
checked before.
By fixing the logic fixed the tests that triggered off this faulty logic

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index 1828354..145df57 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -144,18 +144,18 @@
               <span class="oi" data-glyph="share-boxed" title="Reply to this comment"></span>
             </a>
           {% endif %}
-          {% if id != 0 and g.fas_user and g.repo_committer or (
+          {% if id != 0 and g.fas_user and (g.repo_committer or (
               comment.parent.status in [True, 'Open']
-              and g.fas_user.username == comment.user.username) %}
+              and g.fas_user.username == comment.user.username)) %}
           <a class="btn btn-secondary btn-sm edit_btn" href="{{
               '%s/comment/%s/edit' % (request.base_url, comment.id) }}"
               data-comment="{{ comment.id }}" data-objid="{{ issueid }}">
             <span class="oi" data-glyph="pencil" title="Edit comment"></span>
           </a>
           {% endif %}
-          {% if id != 0 and g.fas_user and g.repo_committer or (
+          {% if id != 0 and g.fas_user and (g.repo_committer or (
               comment.parent.status in [True, 'Open']
-              and g.fas_user.username == comment.user.username) %}
+              and g.fas_user.username == comment.user.username)) %}
           <button class="btn btn-secondary btn-sm" type="submit"
               name="drop_comment" value="{{ comment.id }}"
               onclick="return confirm('Do you really want to remove this comment?');"