瀏覽代碼

fix user groups page

Yuki Takei 6 年之前
父節點
當前提交
8b004244ce
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 4 4
      src/server/views/admin/user-group-detail.html
  2. 2 2
      src/server/views/admin/user-groups.html

+ 4 - 4
src/server/views/admin/user-group-detail.html

@@ -101,7 +101,7 @@
             <div class="form-group">
             <div class="form-group">
               <label class="col-sm-2 control-label">{{ t('Created') }}</label>
               <label class="col-sm-2 control-label">{{ t('Created') }}</label>
               <div class="col-sm-4">
               <div class="col-sm-4">
-                <input class="form-control" type="text" disabled value="{{userGroup.createdAt|date('Y-m-d', sRelation.relatedUser.createdAt.getTimezoneOffset()) }}">
+                <input class="form-control" type="text" disabled value="{{userGroup.createdAt|datetz('Y-m-d') }}">
               </div>
               </div>
             </div>
             </div>
             <div class="form-group">
             <div class="form-group">
@@ -125,7 +125,7 @@
             </th>
             </th>
             <th>{{ t('Name') }}</th>
             <th>{{ t('Name') }}</th>
             <th width="100px">{{ t('Created') }}</th>
             <th width="100px">{{ t('Created') }}</th>
-            <th width="150px">{{ t('Last Login')}}</th>
+            <th width="160px">{{ t('Last Login')}}</th>
             <th width="70px"></th>
             <th width="70px"></th>
           </tr>
           </tr>
         </thead>
         </thead>
@@ -140,9 +140,9 @@
               <strong>{{ sRelation.relatedUser.username }}</strong>
               <strong>{{ sRelation.relatedUser.username }}</strong>
             </td>
             </td>
             <td>{{ sRelation.relatedUser.name }}</td>
             <td>{{ sRelation.relatedUser.name }}</td>
-            <td>{{ sRelation.relatedUser.createdAt|date('Y-m-d', sRelation.relatedUser.createdAt.getTimezoneOffset()) }}</td>
+            <td>{{ sRelation.relatedUser.createdAt|datetz('Y-m-d') }}</td>
             <td>
             <td>
-              {% if sRelation.relatedUser.lastLoginAt %} {{ sRelation.relatedUser.lastLoginAt|date('Y-m-d H:i', sRelation.relatedUser.createdAt.getTimezoneOffset()) }} {% endif %}
+              {% if sRelation.relatedUser.lastLoginAt %} {{ sRelation.relatedUser.lastLoginAt|datetz('Y-m-d H:i:s') }} {% endif %}
             </td>
             </td>
             <td>
             <td>
               <div class="btn-group admin-user-menu">
               <div class="btn-group admin-user-menu">

+ 2 - 2
src/server/views/admin/user-groups.html

@@ -83,7 +83,7 @@
           <tr>
           <tr>
             <th>{{ t('Name') }}</th>
             <th>{{ t('Name') }}</th>
             <th>{{ t('User') }}</th>
             <th>{{ t('User') }}</th>
-            <th width="100px">{{ t('Created') }}</th>
+            <th width="160px">{{ t('Created') }}</th>
             <th width="70px"></th>
             <th width="70px"></th>
           </tr>
           </tr>
         </thead>
         </thead>
@@ -101,7 +101,7 @@
               <li class="list-inline-item badge badge-primary">{{relation.relatedUser.username}}</li>
               <li class="list-inline-item badge badge-primary">{{relation.relatedUser.username}}</li>
               {% endfor %}
               {% endfor %}
             </ul></td>
             </ul></td>
-            <td>{{ sGroup.createdAt|date('Y-m-d', sGroup.createdAt.getTimezoneOffset()) }}</td>
+            <td>{{ sGroup.createdAt|datetz('Y-m-d H:i:s') }}</td>
             {% if isAclEnabled %}
             {% if isAclEnabled %}
             <td>
             <td>
               <div class="btn-group admin-group-menu">
               <div class="btn-group admin-group-menu">