فهرست منبع

ensure to show unlink button when both moved and redirected

Yuki Takei 7 سال پیش
والد
کامیت
0f7c47fead
1فایلهای تغییر یافته به همراه6 افزوده شده و 10 حذف شده
  1. 6 10
      src/server/views/widget/page_alerts.html

+ 6 - 10
src/server/views/widget/page_alerts.html

@@ -32,18 +32,14 @@
     </div>
     </div>
     {% endif %}
     {% endif %}
 
 
-    {% if req.query.renamed and not page.isDeleted() %}
-    <div class="alert alert-info alert-moved">
-      <span>
-        <strong>{{ t('Moved') }}: </strong> {{ t('page_page.notice.moved', req.sanitize(req.query.renamed)) }}
-      </span>
-    </div>
-    {% endif %}
-
-    {% if req.query.redirectFrom and not page.isDeleted() %}
+    {% if not page.isDeleted() and (req.query.renamed or req.query.redirectFrom) %}
     <div class="alert alert-info alert-moved d-flex align-items-center justify-content-between">
     <div class="alert alert-info alert-moved d-flex align-items-center justify-content-between">
       <span>
       <span>
-        <strong>{{ t('Moved') }}: </strong> {{ t('page_page.notice.moved', req.sanitize(req.query.redirectFrom)) }}
+        {% if req.query.renamed %}
+          <strong>{{ t('Moved') }}: </strong> {{ t('page_page.notice.moved', req.sanitize(req.query.renamed)) }}
+        {% else %}
+          <strong>{{ t('Moved') }}: </strong> {{ t('page_page.notice.moved', req.sanitize(req.query.redirectFrom)) }}
+        {% endif %}
       </span>
       </span>
       {% if user %}
       {% if user %}
       <form role="form" id="unlink-page-form" onsubmit="return false;">
       <form role="form" id="unlink-page-form" onsubmit="return false;">