yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 22:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lowercase attributes name in content-type-builder, select default connection when creating a model, remove check out our tutorial link

Browse Source
This commit is contained in:
cyril lopez 2017-10-10 15:20:11 +02:00
parent 77488007fc
commit 12d92b88df
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-plugin-content-type-builder/admin/src/components/AttributeRow/styles.scss
View File

@ -39,7 +39,6 @@
margin-left: 3.9rem; margin-left: 3.9rem;
color: #333740; color: #333740;
font-weight: 600; font-weight: 600;
text-transform: capitalize;
} }
} }

2
packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
View File

@ -6,7 +6,7 @@
"label": "content-type-builder.form.contentType.item.connections", "label": "content-type-builder.form.contentType.item.connections",
"name": "connection", "name": "connection",
"type": "select", "type": "select",
"value": "", "value": "default",
"items": [{}], "items": [{}],
"validations": { "validations": {
"required": true "required": true

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

@ -10,7 +10,7 @@ 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 } from 'lodash';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { Link, NavLink } from 'react-router-dom'; import { NavLink } from 'react-router-dom';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { router } from 'app'; import { router } from 'app';
@ -101,18 +101,18 @@ export class ModelPage extends React.Component { // eslint-disable-line react/pr
<FormattedMessage id="content-type-builder.menu.section.documentation.guide" />&nbsp; <FormattedMessage id="content-type-builder.menu.section.documentation.guide" />&nbsp;
<FormattedMessage id="content-type-builder.menu.section.documentation.guideLink"> <FormattedMessage id="content-type-builder.menu.section.documentation.guideLink">
{(message) => ( {(message) => (
<a href="http://strapi.io/documentation" target="_blank">{message}</a> <a href="http://strapi.io/documentation/3.x.x/guides/models.html" target="_blank">{message}</a>
)} )}
</FormattedMessage> </FormattedMessage>
</li> </li>
<li> {/*<li>
<FormattedMessage id="content-type-builder.menu.section.documentation.tutorial" />&nbsp; <FormattedMessage id="content-type-builder.menu.section.documentation.tutorial" />&nbsp;
<FormattedMessage id="content-type-builder.menu.section.documentation.tutorialLink"> <FormattedMessage id="content-type-builder.menu.section.documentation.tutorialLink">
{(mess) => ( {(mess) => (
<Link to="#" target="_blank">{mess}</Link> <Link to="#" target="_blank">{mess}</Link>
)} )}
</FormattedMessage> </FormattedMessage>
</li> </li>*/}
</ul> </ul>
</div> </div>
) )

7
packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/sagas.js
View File

@ -129,7 +129,6 @@ export function* fetchDatabases(action) {
const opts = { const opts = {
method: 'GET', method: 'GET',
}; };
const requestUrlListDatabases = `/settings-manager/configurations/databases/${action.environment}`; const requestUrlListDatabases = `/settings-manager/configurations/databases/${action.environment}`;
const requestUrlAppDatabases = '/settings-manager/configurations/database/model'; const requestUrlAppDatabases = '/settings-manager/configurations/database/model';
@ -186,7 +185,6 @@ export function* postLanguage() {
body, body,
method: 'POST', method: 'POST',
}; };
const requestUrl = '/settings-manager/configurations/languages'; const requestUrl = '/settings-manager/configurations/languages';
const resp = yield call(request, requestUrl, opts, true); const resp = yield call(request, requestUrl, opts, true);
@ -216,7 +214,6 @@ export function* postDatabase(action) {
method: 'POST', method: 'POST',
body, body,
}; };
const requestUrl = `/settings-manager/configurations/databases/${action.endPoint}`; const requestUrl = `/settings-manager/configurations/databases/${action.endPoint}`;
const resp = yield call(request, requestUrl, opts, true); const resp = yield call(request, requestUrl, opts, true);
@ -245,15 +242,11 @@ export function* settingsEdit(action) {
// Show button loader // Show button loader
yield put(setLoader()); yield put(setLoader());
window.Strapi.notification.info('settings-manager.strapi.notification.info.serverRestart');
const opts = { const opts = {
body: action.newSettings, body: action.newSettings,
method: 'PUT', method: 'PUT',
}; };
const requestUrl = `/settings-manager/configurations/${action.endPoint}`; const requestUrl = `/settings-manager/configurations/${action.endPoint}`;
const resp = yield call(request, requestUrl, opts, true); const resp = yield call(request, requestUrl, opts, true);
if (resp.ok) { if (resp.ok) {