yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload

Browse Source
This commit is contained in:
Aurelsicoko 2018-03-05 18:40:57 +01:00
commit 670f1d8434
7 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/strapi-generate-api/templates/mongoose/model.settings.template
View File

@ -5,6 +5,9 @@
"name": "<%= id %>",
"description": "<%= description %>"
},
"options": {
"timestamps": true
},
"attributes": {
<%= attributes %>
}

2
packages/strapi-mongoose/lib/index.js
View File

@ -158,6 +158,8 @@ module.exports = function (strapi) {
});
});
collection.schema.set('timestamps', _.get(definition, 'options.timestamps') === true);
collection.schema.options.toObject = collection.schema.options.toJSON = {
virtuals: true,
transform: function (doc, returned, opts) {

3
packages/strapi-plugin-content-manager/admin/src/components/Edit/index.js
View File

@ -126,7 +126,8 @@ class Edit extends React.PureComponent {
fileRelationAllowMultipleUpload = (relationName) => has(this.props.schema, ['relations', relationName, 'collection']);
orderAttributes = (displayedFields) => Object.keys(displayedFields).sort(name => Object.keys(this.getUploadRelations(this.props)).includes(name));
// orderAttributes = (displayedFields) => Object.keys(displayedFields).sort(name => Object.keys(this.getUploadRelations(this.props)).includes(name));
orderAttributes = (displayedFields) => Object.keys(displayedFields);
render(){
return (

7
packages/strapi-plugin-upload/admin/src/components/Li/index.js
View File

@ -9,6 +9,7 @@ import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import { CopyToClipboard } from 'react-copy-to-clipboard';
import cn from 'classnames';
import moment from 'moment';
import FileIcon from 'components/FileIcon';
import IcoContainer from 'components/IcoContainer';
@ -100,6 +101,12 @@ class Li extends React.Component {
<FileIcon fileType={item.ext} />
</div>
{['hash', 'name', 'updatedAt', 'size', 'relatedTo', ''].map((value, key) => {
if (value === 'updatedAt') {
return (
<div key={key} className={styles.truncate}>{moment(item[value]).format('YYYY/MM/DD - HH:mm')}</div>
);
}
if (value === 'size') {
const unit = this.getUnit(item[value]);

3
packages/strapi-plugin-upload/models/File.settings.json
View File

@ -4,6 +4,9 @@
"name": "file",
"description": ""
},
"options": {
"timestamps": true
},
"attributes": {
"name": {
"type": "string",

2
packages/strapi-plugin-upload/package.json
View File

@ -48,4 +48,4 @@
"npm": ">= 3.0.0"
},
"license": "MIT"
}
}

3
packages/strapi-plugin-users-permissions/models/User.settings.json
View File

@ -4,6 +4,9 @@
"name": "user",
"description": ""
},
"options": {
"timestamps": true
},
"attributes": {
"username": {
"type": "string",