Fix edit condition conflicts

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 }}">