Merge branch '7.1'

Conflicts:
	frontend/src/pages/search/advanced-search.js

frontend/src/pages/lib-content-view/lib-content-toolbar.js

@@ -54,6 +54,11 @@ const propTypes = {
 class LibContentToolbar extends React.Component {
 
   render() {
+
+    if (!this.props.userPerm) {
+      return <div className="cur-view-toolbar"></div>
+    }
+
     if (this.props.isViewFile) {
       return (
         <Fragment>

frontend/src/pages/search/advanced-search.js

@@ -1,9 +1,10 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import MediaQuery from 'react-responsive';
-import { gettext, lang } from '../../utils/constants';
+import moment from 'moment';
 import { Button, Col, Collapse, CustomInput, FormGroup, Input, Label, Row, InputGroupAddon, InputGroup } from 'reactstrap';
-import SelectDate from './select-date';
+import { gettext } from '../../utils/constants';
+import DateTimePicker from '../../components/date-and-time-picker';
 
 const { repo_name, search_repo } = window.search.pageOptions;
 
@@ -24,6 +25,34 @@ class AdvancedSearch extends React.Component {
     return ftype;
   };
 
+  disabledStartDate = (startValue) => {
+    if (!startValue) {
+      return false;
+    }
+
+    const isAfterToday = startValue.isAfter(moment(), 'day');
+    const { time_to } = this.props.stateAndValues;
+    const endValue = time_to;
+    if (!endValue) {
+      return isAfterToday;
+    }
+    return startValue.isAfter(endValue) || isAfterToday;
+  }
+
+  disabledEndDate = (endValue) => {
+    if (!endValue) {
+      return false;
+    }
+
+    const isAfterToday = endValue.isAfter(moment(), 'day');
+    const { time_from } = this.props.stateAndValues;
+    const startValue = time_from;
+    if (!startValue) {
+      return isAfterToday;
+    }
+    return endValue.isBefore(startValue) || isAfterToday;
+  }
+
   render() {
     const { stateAndValues } = this.props;
     const { errorDateMsg, errorSizeMsg } = stateAndValues;
@@ -43,7 +72,7 @@ class AdvancedSearch extends React.Component {
             </span>
           }
           {(time_from && time_to ) &&
-            <span className="mr-4">{gettext('Last Update')}{': '}{time_from}{' '}{gettext('to')}{' '}{time_to}</span>
+            <span className="mr-4">{gettext('Last Update')}{': '}{time_from.format('YYYY-MM-DD')}{' '}{gettext('to')}{' '}{time_to.format('YYYY-MM-DD')}</span>
           }
           {(size_from && size_to) &&
             <span className="mr-4">{gettext('Size')}{': '}{size_from}{'MB - '}{size_to}{'MB'}</span>
@@ -168,20 +197,24 @@ class AdvancedSearch extends React.Component {
               <Row>
                 <Col md="2" lg="2" className="mt-2">{gettext('Last Update')}{': '}</Col>
                 <Col md="4" lg="4" sm="4" xs="5" className="position-relative">
-                  <SelectDate
-                    onDateChange={this.props.handleTimeFromInput}
+                  <DateTimePicker
+                    inputWidth={'100%'}
+                    disabledDate={this.disabledStartDate}
                     value={stateAndValues.time_from}
-                    locale={lang}
-                  />
+                    onChange={this.props.handleTimeFromInput}
+                    showHourAndMinute={false}
+                  />  
                   <span className="select-data-icon"><i className="fa fa-calendar-alt"></i></span>
                 </Col>
                 <div className="mt-2">-</div>
                 <Col md="4" lg="4" sm="4" xs="5" className="position-relative">
-                  <SelectDate
-                    onDateChange={this.props.handleTimeToInput}
+                  <DateTimePicker
+                    inputWidth={'100%'}
+                    disabledDate={this.disabledEndDate}
                     value={stateAndValues.time_to}
-                    locale={lang}
-                  />
+                    onChange={this.props.handleTimeToInput}
+                    showHourAndMinute={false}
+                  />  
                   <span className="select-data-icon"><i className="fa fa-calendar-alt"></i></span>
                 </Col>
               </Row>

frontend/src/pages/search/main-panel.js

@@ -30,8 +30,8 @@ class SearchViewPanel extends React.Component {
       search_ftypes: search_ftypes,
       fileTypeItemsStatus: [false, false, false, false, false, false, false],
       input_fexts: '',
-      time_from: '',
-      time_to: '',
+      time_from: null,
+      time_to: null,
       size_from: '',
       size_to: '',
       // search result
@@ -81,8 +81,9 @@ class SearchViewPanel extends React.Component {
     if (this.state.search_ftypes) {params.search_ftypes = this.state.search_ftypes;}
     if (this.state.per_page) {params.per_page = this.state.per_page;}
     if (this.state.input_fexts) {params.input_fexts = this.state.input_fexts;}
-    if (this.state.time_from) {params.time_from = moment(this.state.time_from).valueOf() / 1000;}
-    if (this.state.time_to) {params.time_to = moment(this.state.time_to).valueOf() / 1000;}
+    const { time_from, time_to } = this.state;
+    if (time_from) {params.time_from = parseInt(time_from.valueOf() / 1000);}
+    if (time_to) {params.time_to = parseInt(time_to.valueOf() / 1000);}
     if (this.state.size_from) {params.size_from = this.state.size_from * 1000 *1000;}
     if (this.state.size_to) {params.size_to = this.state.size_to * 1000 * 1000;}
     if (ftype.length !== 0) {params.ftype = ftype;}
@@ -90,10 +91,6 @@ class SearchViewPanel extends React.Component {
   };
 
   handleSubmit = () => {
-    if (this.compareNumber(this.state.time_from, this.state.time_to)) {
-      this.setState({ errorDateMsg: gettext('Start date should be earlier than end date.') });
-      return;
-    }
     if (this.compareNumber(this.state.size_from, this.state.size_to)) {
       this.setState({ errorSizeMsg: gettext('Invalid file size range.') });
       return;
@@ -138,8 +135,8 @@ class SearchViewPanel extends React.Component {
       search_ftypes: search_ftypes,
       fileTypeItemsStatus: [false, false, false, false, false, false, false],
       input_fexts: '',
-      time_from: '',
-      time_to: '',
+      time_from: null,
+      time_to: null,
       size_from: '',
       size_to: '',
       errorMsg: '',
@@ -258,12 +255,14 @@ class SearchViewPanel extends React.Component {
   };
 
   handleTimeFromInput = (value) => {
-    this.setState({ time_from: value });
+    // set the time to be '00:00:00'
+    this.setState({time_from: value ? value.hours(0).minutes(0).seconds(0) : value});
     if (this.state.errorDateMsg) this.setState({ errorDateMsg: '' });
   };
 
   handleTimeToInput = (value) => {
-    this.setState({ time_to: value });
+    // set the time to be '23:59:59'
+    this.setState({time_to: value ? value.hours(23).minutes(59).seconds(59) : value});
     if (this.state.errorDateMsg) this.setState({ errorDateMsg: '' });
   };
 

frontend/src/pages/search/select-date.js

@@ -1,130 +0,0 @@
-import React from 'react';
-import Calendar from '@seafile/seafile-calendar';
-import DatePicker from '@seafile/seafile-calendar/lib/Picker';
-import '@seafile/seafile-calendar/assets/index.css';
-import moment from 'moment';
-
-const zhCN = require('@seafile/seafile-calendar/lib/locale/zh_CN');
-const zhTW = require('@seafile/seafile-calendar/lib/locale/zh_TW');
-const enUS = require('@seafile/seafile-calendar/lib/locale/en_US');
-const frFR = require('@seafile/seafile-calendar/lib/locale/fr_FR');
-const deDE = require('@seafile/seafile-calendar/lib/locale/de_DE');
-const esES = require('@seafile/seafile-calendar/lib/locale/es_ES');
-const plPL = require('@seafile/seafile-calendar/lib/locale/pl_PL');
-const csCZ = require('@seafile/seafile-calendar/lib/locale/cs_CZ');
-
-const format = 'YYYY-MM-DD';
-const now = moment();
-const defaultCalendarValue = now.clone();
-class SelectDate extends React.Component {  
-  constructor(props) {
-    super(props);
-    this.state = {
-      showTime: true,
-      showDateInput: true,
-      disabled: false,
-      value: moment(props.value)
-    };
-  }
-  
-  onChange = (value) => {
-    this.props.onDateChange(value? value.format(format) : '');
-    this.setState({
-      value: value
-    }); 
-  }
-
-  toggleDisabled = () => {
-    this.setState({
-      disabled: !this.state.disabled         
-    });
-  }
-
-  translateCalendar = (locale) => {
-    let language = enUS;
-    if (locale) {
-      switch (locale) {
-      case 'zh-ch':
-        language = zhCN;
-        break;
-      case 'zh-tw':
-        language = zhTW;
-        break;
-      case 'en':
-        language = enUS;
-        break;
-      case 'fr':
-        language = frFR;
-        break;
-      case 'de':
-        language = deDE;
-        break;
-      case 'es':
-        language = esES;
-        break;
-      case 'es-ar':
-        language = esES;
-        break;
-      case 'es-mx':
-        language = esES;
-        break;
-      case 'pl':
-        language = plPL;
-        break;
-      case 'cs':
-        language = csCZ;
-        break;
-      }
-    }
-    return language;
-  }
-
-  render() {
-    const state = this.state;
-    let locale = this.translateCalendar(this.props.locale);
-
-    const calendar = (
-      <Calendar
-        style = {{zIndex: 1000}}
-        format={format}
-        showDateInput={false}
-        defaultValue={defaultCalendarValue}
-        locale={locale}
-      />  
-    );
-   
-    return (
-      <DatePicker
-        animation={'slide-up'}
-        calendar={calendar}
-        value={this.props.value=== '' ? defaultCalendarValue : state.value}
-        onChange={this.onChange}
-      >
-        {
-          ({ value }) => {
-            let showValue;
-            if (this.state.value.format(format) === 'Invalid date') {
-              showValue = '';
-            } else {
-              showValue = value.format(format);
-            }
-            return (
-              <span tabIndex='0'>
-                <input
-                  style={{width: '100%'}}
-                  disabled={state.disabled}
-                  readOnly
-                  tabIndex='-1'
-                  className='ant-calendar-pick-input ant-input'
-                  value={showValue}
-                />  
-              </span>  
-            );
-          }  
-        }
-      </DatePicker>  
-    );
-  }
-}
-
-export default SelectDate;

frontend/src/pages/sys-admin/orgs/org-users.js

@@ -197,7 +197,7 @@ class Item extends Component {
           </td>
           <td>{`${Utils.bytesToSize(item.quota_usage)} / ${item.quota_total > 0 ? Utils.bytesToSize(item.quota_total) : '--'}`}</td>
           <td>
-            {moment(item.ctime).format('YYYY-MM-DD HH:mm:ss')}{' / '}{item.last_login ? moment(item.last_login).fromNow() : '--'}
+            {moment(item.create_time).format('YYYY-MM-DD HH:mm:ss')}{' / '}{item.last_login ? moment(item.last_login).fromNow() : '--'}
           </td>
           <td>
             {(isOpIconShown && item.email != username) &&