Explorar el Código

create customizeTitle add validator

sooouh hace 6 años
padre
commit
4ecd6acce9

+ 4 - 3
src/client/js/components/Admin/Customize/Customize.jsx

@@ -13,11 +13,11 @@ import CustomizeHighlightSetting from './CustomizeHighlightSetting';
 import CustomizeCssSetting from './CustomizeCssSetting';
 import CustomizeCssSetting from './CustomizeCssSetting';
 import CustomizeScriptSetting from './CustomizeScriptSetting';
 import CustomizeScriptSetting from './CustomizeScriptSetting';
 import CustomizeHeaderSetting from './CustomizeHeaderSetting';
 import CustomizeHeaderSetting from './CustomizeHeaderSetting';
+import CustomizeTitle from './CustomizeTitle';
 
 
 class Customize extends React.Component {
 class Customize extends React.Component {
 
 
   render() {
   render() {
-    const { t } = this.props;
 
 
     return (
     return (
       <Fragment>
       <Fragment>
@@ -33,8 +33,9 @@ class Customize extends React.Component {
         <div className="mb-5">
         <div className="mb-5">
           <CustomizeHighlightSetting />
           <CustomizeHighlightSetting />
         </div>
         </div>
-        <legend>{t('customize_page.custom_title')}</legend>
-        {/* カスタムタイトルフォームの react componentをここで呼ぶ(GW-278) */}
+        <div className="mb-5">
+          <CustomizeTitle />
+        </div>
         <div className="mb-5">
         <div className="mb-5">
           <CustomizeHeaderSetting />
           <CustomizeHeaderSetting />
         </div>
         </div>

+ 2 - 1
src/client/js/components/Admin/Customize/CustomizeTitle.jsx

@@ -34,10 +34,11 @@ class CustomizeTitle extends React.Component {
   }
   }
 
 
   render() {
   render() {
-    const { appContainer, adminCustomizeContainer } = this.props;
+    const { t, appContainer, adminCustomizeContainer } = this.props;
 
 
     return (
     return (
       <React.Fragment>
       <React.Fragment>
+        <h2 className="admin-setting-header">{t('customize_page.custom_title')}</h2>
         <p
         <p
           className="well"
           className="well"
           // eslint-disable-next-line react/no-danger, max-len
           // eslint-disable-next-line react/no-danger, max-len

+ 1 - 1
src/client/js/services/AdminCustomizeContainer.js

@@ -255,7 +255,7 @@ export default class AdminCustomizeContainer extends Container {
    */
    */
   async updateCustomizeTitle() {
   async updateCustomizeTitle() {
     // TODO create apiV3
     // TODO create apiV3
-    const response = await this.appContainer.apiv3.put('/customize-setting/customizeTitle', {
+    const response = await this.appContainer.apiv3.put('/customize-setting/customize-title', {
       customizeTitle: this.state.currentCustomizeTitle,
       customizeTitle: this.state.currentCustomizeTitle,
     });
     });
     const { customizedParams } = response.data;
     const { customizedParams } = response.data;

+ 4 - 1
src/server/routes/apiv3/customize-setting.js

@@ -85,6 +85,9 @@ module.exports = (crowi) => {
       body('isEnabledAttachTitleHeader').isBoolean(),
       body('isEnabledAttachTitleHeader').isBoolean(),
       body('recentCreatedLimit').isInt().isInt({ min: 1, max: 1000 }),
       body('recentCreatedLimit').isInt().isInt({ min: 1, max: 1000 }),
     ],
     ],
+    customizeTitle: [
+      body('customizeTitle').isString(),
+    ],
     customizeHeader: [
     customizeHeader: [
       body('customizeHeader').isString(),
       body('customizeHeader').isString(),
     ],
     ],
@@ -370,7 +373,7 @@ module.exports = (crowi) => {
    *          200:
    *          200:
    *            description: Succeeded to update customizeTitle
    *            description: Succeeded to update customizeTitle
    */
    */
-  router.put('/customizeTitle', loginRequiredStrictly, adminRequired, csrf, validator.customizeTitle, ApiV3FormValidator, async(req, res) => {
+  router.put('/customize-title', loginRequiredStrictly, adminRequired, csrf, validator.customizeTitle, ApiV3FormValidator, async(req, res) => {
     const requestParams = {
     const requestParams = {
       'customize:title': req.body.customizeTitle,
       'customize:title': req.body.customizeTitle,
     };
     };