itizawa 6 ani în urmă
părinte
comite
f76b1dd68a

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

@@ -32,7 +32,7 @@ CustomizeFunctionOption.propTypes = {
   label: PropTypes.string.isRequired,
   label: PropTypes.string.isRequired,
   isChecked: PropTypes.bool.isRequired,
   isChecked: PropTypes.bool.isRequired,
   onChecked: PropTypes.func.isRequired,
   onChecked: PropTypes.func.isRequired,
-  children: PropTypes.array.isRequired,
+  children: PropTypes.object.isRequired,
 };
 };
 
 
 export default withTranslation()(CustomizeFunctionOption);
 export default withTranslation()(CustomizeFunctionOption);

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

@@ -54,9 +54,7 @@ class CustomizeBehaviorSetting extends React.Component {
               onChecked={() => { adminCustomizeContainer.switchEnableTimeline() }}
               onChecked={() => { adminCustomizeContainer.switchEnableTimeline() }}
             >
             >
               <p className="help-block">
               <p className="help-block">
-                { t('customize_page.subpage_display') }
-              </p>
-              <p className="help-block">
+                { t('customize_page.subpage_display') }<br />
                 { t('customize_page.performance_decrease') }<br />
                 { t('customize_page.performance_decrease') }<br />
                 { t('customize_page.list_page_display') }
                 { t('customize_page.list_page_display') }
               </p>
               </p>

+ 1 - 0
src/server/models/config.js

@@ -184,6 +184,7 @@ module.exports = function(crowi) {
       attrWhiteList: crowi.xssService.getAttrWhiteList(),
       attrWhiteList: crowi.xssService.getAttrWhiteList(),
       highlightJsStyleBorder: crowi.configManager.getConfig('crowi', 'customize:highlightJsStyleBorder'),
       highlightJsStyleBorder: crowi.configManager.getConfig('crowi', 'customize:highlightJsStyleBorder'),
       isSavedStatesOfTabChanges: crowi.configManager.getConfig('crowi', 'customize:isSavedStatesOfTabChanges'),
       isSavedStatesOfTabChanges: crowi.configManager.getConfig('crowi', 'customize:isSavedStatesOfTabChanges'),
+      isEnabledAttachTitleHeader: crowi.configManager.getConfig('crowi', 'customize:isEnabledAttachTitleHeader'),
       hasSlackConfig: crowi.slackNotificationService.hasSlackConfig(),
       hasSlackConfig: crowi.slackNotificationService.hasSlackConfig(),
       env: {
       env: {
         PLANTUML_URI: env.PLANTUML_URI || null,
         PLANTUML_URI: env.PLANTUML_URI || null,