yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-12 00:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PR feedback

Browse Source
This commit is contained in:
Jim Laurie 2017-09-25 14:17:40 +02:00
parent 1d2ac86467
commit 2338604609
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
View File

@ -8,7 +8,7 @@ import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { createStructuredSelector } from 'reselect'; import { createStructuredSelector } from 'reselect';
import { bindActionCreators, compose } from 'redux'; import { bindActionCreators, compose } from 'redux';
import { get, has, size, replace, startCase, findIndex } from 'lodash'; import { get, has, size, replace, startCase, findIndex, includes } from 'lodash';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { Link, NavLink } from 'react-router-dom'; import { Link, NavLink } from 'react-router-dom';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
@ -155,24 +155,19 @@ export class ModelPage extends React.Component { // eslint-disable-line react/pr
const parallelAttributeIndex = findIndex(this.props.modelPage.model.attributes, ['name', attribute.params.key]); const parallelAttributeIndex = findIndex(this.props.modelPage.model.attributes, ['name', attribute.params.key]);
const hasParallelAttribute = settingsType === 'defineRelation' && parallelAttributeIndex !== -1 ? `::${parallelAttributeIndex}` : ''; const hasParallelAttribute = settingsType === 'defineRelation' && parallelAttributeIndex !== -1 ? `::${parallelAttributeIndex}` : '';
let attributeType = attribute.params.type ? attribute.params.type : 'relation'; let attributeType;
switch (attributeType) { switch (attribute.params.type) {
case 'integer': case 'integer':
attributeType = 'number';
break;
case 'float': case 'float':
attributeType = 'number';
break;
case 'decimal': case 'decimal':
attributeType = 'number'; attributeType = 'number';
break; break;
default: default:
attributeType = attribute.params.type ? attribute.params.type : 'relation';
} }
router.push(`/plugins/content-type-builder/models/${this.props.match.params.modelName}#edit${this.props.match.params.modelName}::attribute${attributeType}::${settingsType}::${index}${hasParallelAttribute}`); router.push(`/plugins/content-type-builder/models/${this.props.match.params.modelName}#edit${this.props.match.params.modelName}::attribute${attributeType}::${settingsType}::${index}${hasParallelAttribute}`);
} }