Просмотр исходного кода

Merge branch 'master' into imprv/refactor-installer

Yuki Takei 6 лет назад
Родитель
Сommit
e82a4f3a4e
2 измененных файлов с 4 добавлено и 1 удалено
  1. 2 0
      CHANGES.md
  2. 2 1
      src/server/views/widget/page_alerts.html

+ 2 - 0
CHANGES.md

@@ -11,6 +11,8 @@
 * Feature: Comment Thread
 * Feature: Comment Thread
 * Improvement Draft list
 * Improvement Draft list
 * Fix: Deleting page completely
 * Fix: Deleting page completely
+* I18n: User Management Details
+* I18n: Group Management Details
 * Support: Apply unstated
 * Support: Apply unstated
 * Support: Upgrade libs
 * Support: Upgrade libs
     * mini-css-extract-plugin
     * mini-css-extract-plugin

+ 2 - 1
src/server/views/widget/page_alerts.html

@@ -1,6 +1,7 @@
 <div class="row row-alerts">
 <div class="row row-alerts">
   <div class="col-xs-12">
   <div class="col-xs-12">
-    {% if page && page.grant %}
+    {% if page && page.grant && page.grant > 1 %}
+
       <p class="alert alert-inverse alert-grant">
       <p class="alert alert-inverse alert-grant">
       {% if page.grant == 2 %}
       {% if page.grant == 2 %}
         <i class="icon-fw icon-link"></i><strong>{{ consts.pageGrants[page.grant] }}</strong> ({{ t('Browsing of this page is restricted') }})
         <i class="icon-fw icon-link"></i><strong>{{ consts.pageGrants[page.grant] }}</strong> ({{ t('Browsing of this page is restricted') }})