mizozobu 6 лет назад
Родитель
Сommit
9979d0df99

+ 1 - 1
src/client/js/components/Admin/UserGroup/UserGroupTable.jsx

@@ -73,7 +73,7 @@ class UserGroupTable extends React.Component {
                       })}
                       })}
                     </ul>
                     </ul>
                   </td>
                   </td>
-                  <td>{dateFnsFormat(new Date(group.createdAt), 'yyyy-MM-dd')}</td>
+                  <td>{dateFnsFormat(new Date(group.createdAt), 'YYYY-MM-DD')}</td>
                   {this.props.isAclEnabled
                   {this.props.isAclEnabled
                     ? (
                     ? (
                       <td>
                       <td>

+ 1 - 1
src/client/js/components/Admin/UserGroupDetail/UserGroupEditForm.jsx

@@ -72,7 +72,7 @@ class UserGroupEditForm extends React.Component {
             <div className="form-group">
             <div className="form-group">
               <label className="col-sm-2 control-label">{ t('Created') }</label>
               <label className="col-sm-2 control-label">{ t('Created') }</label>
               <div className="col-sm-4">
               <div className="col-sm-4">
-                <input className="form-control" type="text" disabled value={dateFnsFormat(new Date(this.props.userGroup.createdAt), 'yyyy-MM-dd')} />
+                <input className="form-control" type="text" disabled value={dateFnsFormat(new Date(this.props.userGroup.createdAt), 'YYYY-MM-DD')} />
               </div>
               </div>
             </div>
             </div>
             <div className="form-group">
             <div className="form-group">

+ 2 - 2
src/client/js/components/Admin/UserGroupDetail/UserGroupUserTable.jsx

@@ -37,8 +37,8 @@ class UserGroupUserTable extends React.Component {
                     <strong>{relatedUser.username}</strong>
                     <strong>{relatedUser.username}</strong>
                   </td>
                   </td>
                   <td>{relatedUser.name}</td>
                   <td>{relatedUser.name}</td>
-                  <td>{relatedUser.createdAt ? dateFnsFormat(new Date(relatedUser.createdAt), 'yyyy-MM-dd') : ''}</td>
-                  <td>{relatedUser.lastLoginAt ? dateFnsFormat(new Date(relatedUser.lastLoginAt), 'yyyy-MM-dd HH:mm:ss') : ''}</td>
+                  <td>{relatedUser.createdAt ? dateFnsFormat(new Date(relatedUser.createdAt), 'YYYY-MM-DD') : ''}</td>
+                  <td>{relatedUser.lastLoginAt ? dateFnsFormat(new Date(relatedUser.lastLoginAt), 'YYYY-MM-DD HH:mm:ss') : ''}</td>
                   <td>
                   <td>
                     <div className="btn-group admin-user-menu">
                     <div className="btn-group admin-user-menu">
                       <button type="button" className="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
                       <button type="button" className="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">

+ 2 - 2
src/client/js/components/Admin/Users/UserTable.jsx

@@ -94,9 +94,9 @@ class UserTable extends React.Component {
                   </td>
                   </td>
                   <td>{user.name}</td>
                   <td>{user.name}</td>
                   <td>{user.email}</td>
                   <td>{user.email}</td>
-                  <td>{dateFnsFormat(new Date(user.createdAt), 'yyyy-MM-DD')}</td>
+                  <td>{dateFnsFormat(new Date(user.createdAt), 'YYYY-MM-DD')}</td>
                   <td>
                   <td>
-                    { user.lastLoginAt && <span>{dateFnsFormat(new Date(user.lastLoginAt), 'yyyy-MM-DD HH:mm')}</span> }
+                    { user.lastLoginAt && <span>{dateFnsFormat(new Date(user.lastLoginAt), 'YYYY-MM-DD HH:mm')}</span> }
                   </td>
                   </td>
                   <td>
                   <td>
                     <UserMenu user={user} onPasswordResetClicked={this.props.onPasswordResetClicked} />
                     <UserMenu user={user} onPasswordResetClicked={this.props.onPasswordResetClicked} />