From c77730e516dc90125f0657ba192b6604d692cb67 Mon Sep 17 00:00:00 2001
From: Gregorio Chiko Putra <gregorio@lepisi.ac.id>
Date: Wed, 6 Sep 2017 14:11:51 +0700
Subject: [PATCH] Fix edit condition conflicts

---
 App/Views/Data/edit_pengumuman.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/App/Views/Data/edit_pengumuman.html b/App/Views/Data/edit_pengumuman.html
index 595848b..46b3855 100644
--- a/App/Views/Data/edit_pengumuman.html
+++ b/App/Views/Data/edit_pengumuman.html
@@ -99,7 +99,7 @@
         <br>
 
         <button type="submit"
-            {% if (post.status == 0 and post.valid_at <= timestamp or editor_now != creator.id) %}
+            {% if (post.status == 0 or editor_now != creator.id) %}
                 disabled
             {% endif %}
             >
@@ -107,7 +107,7 @@
         </button>
     </form>
 
-    {% if post.status == 1 %}
+    {% if (post.status == 1 and editor_now == creator.id) %}
         <form method="post">
             <input type="hidden" name="id" value="{{ post.id }}">