haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-10 19:29:56 +00:00
Code Issues Releases Wiki Activity

fix org logs time

Browse Source
This commit is contained in:
Michael An
2019-05-02 17:33:31 +08:00
parent ace95037e2
commit 5c1b94df84
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/pages/org-admin/org-logs-file-audit.js
View File

@@ -1,11 +1,14 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import moment from 'moment';
import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import { siteRoot, gettext } from '../../utils/constants'; import { siteRoot, gettext, lang } from '../../utils/constants';
import OrgLogsFileAuditEvent from '../../models/org-logs-file-audit'; import OrgLogsFileAuditEvent from '../../models/org-logs-file-audit';
import '../../css/org-logs.css'; import '../../css/org-logs.css';
moment.locale(lang);
class OrgLogsFileAudit extends React.Component { class OrgLogsFileAudit extends React.Component {
constructor(props) { constructor(props) {
@@ -238,7 +241,7 @@ class FileAuditItem extends React.Component {
<td>{this.renderUser(fileEvent)}</td> <td>{this.renderUser(fileEvent)}</td>
<td>{this.renderType(fileEvent.type)}</td> <td>{this.renderType(fileEvent.type)}</td>
<td>{fileEvent.ip}</td> <td>{fileEvent.ip}</td>
<td>{fileEvent.time}</td> <td>{moment(fileEvent.time).format('YYYY-MM-DD HH:mm:ss')}</td>
<td>{this.renderRepo(fileEvent)}</td> <td>{this.renderRepo(fileEvent)}</td>
<td><span title={fileEvent.file_path}>{fileEvent.file_name}</span></td> <td><span title={fileEvent.file_path}>{fileEvent.file_name}</span></td>
</tr> </tr>

7
frontend/src/pages/org-admin/org-logs-file-update.js
View File

@@ -1,13 +1,16 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import moment from 'moment';
import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import { siteRoot, gettext } from '../../utils/constants'; import { siteRoot, gettext, lang } from '../../utils/constants';
import OrgLogsFileUpdateEvent from '../../models/org-logs-file-update'; import OrgLogsFileUpdateEvent from '../../models/org-logs-file-update';
import ModalPortal from '../../components/modal-portal'; import ModalPortal from '../../components/modal-portal';
import FileUpdateDetailDialog from '../../components/dialog/org-logs-file-update-detail'; import FileUpdateDetailDialog from '../../components/dialog/org-logs-file-update-detail';
import '../../css/org-logs.css'; import '../../css/org-logs.css';
moment.locale(lang);
class OrgLogsFileUpdate extends Component { class OrgLogsFileUpdate extends Component {
constructor(props) { constructor(props) {
@@ -266,7 +269,7 @@ class FileUpdateItem extends React.Component {
<tr className={this.state.highlight ? 'tr-highlight' : ''} <tr className={this.state.highlight ? 'tr-highlight' : ''}
onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}> onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
<td>{this.renderUser(fileEvent)}</td> <td>{this.renderUser(fileEvent)}</td>
<td>{fileEvent.time}</td> <td>{moment(fileEvent.time).format('YYYY-MM-DD HH:mm:ss')}</td>
<td>{this.renderRepo(fileEvent)}</td> <td>{this.renderRepo(fileEvent)}</td>
{this.renderAction(fileEvent)} {this.renderAction(fileEvent)}
</tr> </tr>

7
frontend/src/pages/org-admin/org-logs-perm-audit.js
View File

@@ -1,12 +1,15 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import moment from 'moment';
import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
import { Utils } from '../../utils/utils'; import { Utils } from '../../utils/utils';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import { siteRoot, gettext } from '../../utils/constants'; import { siteRoot, gettext, lang } from '../../utils/constants';
import OrgLogsFilePermEvent from '../../models/org-logs-perm-audit'; import OrgLogsFilePermEvent from '../../models/org-logs-perm-audit';
import '../../css/org-logs.css'; import '../../css/org-logs.css';
moment.locale(lang);
class OrgLogsFileUpdate extends Component { class OrgLogsFileUpdate extends Component {
constructor(props) { constructor(props) {
@@ -225,7 +228,7 @@ class PermAuditItem extends React.Component {
<td>{Utils.sharePerms(permEvent.permission)}</td> <td>{Utils.sharePerms(permEvent.permission)}</td>
<td>{this.renderRepo(permEvent)}</td> <td>{this.renderRepo(permEvent)}</td>
<td>{this.renderFolder(permEvent.folder_name)}</td> <td>{this.renderFolder(permEvent.folder_name)}</td>
<td>{permEvent.time}</td> <td>{moment(permEvent.time).format('YYYY-MM-DD HH:mm:ss')}</td>
</tr> </tr>
); );
} }