itizawa hace 6 años
padre
commit
d73abe440a

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

@@ -38,7 +38,6 @@ class Customize extends React.Component {
     }
     }
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);
-      adminCustomizeContainer.setState({ retrieveError: err });
     }
     }
 
 
   }
   }

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

@@ -88,6 +88,7 @@ export default class AdminCustomizeContainer extends Container {
       this.setState({ currentHighlightJsStyleName: this.state.highlightJsCssSelectorOptions[customizeParams.styleName].name });
       this.setState({ currentHighlightJsStyleName: this.state.highlightJsCssSelectorOptions[customizeParams.styleName].name });
     }
     }
     catch (err) {
     catch (err) {
+      this.setState({ retrieveError: err });
       logger.error(err);
       logger.error(err);
       throw new Error('Failed to fetch data');
       throw new Error('Failed to fetch data');
     }
     }

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

@@ -168,7 +168,7 @@ module.exports = (crowi) => {
       styleBorder: await crowi.configManager.getConfig('crowi', 'customize:highlightJsStyleBorder'),
       styleBorder: await crowi.configManager.getConfig('crowi', 'customize:highlightJsStyleBorder'),
       customizeTitle: await crowi.configManager.getConfig('crowi', 'customize:title'),
       customizeTitle: await crowi.configManager.getConfig('crowi', 'customize:title'),
       customizeHeader: await crowi.configManager.getConfig('crowi', 'customize:header'),
       customizeHeader: await crowi.configManager.getConfig('crowi', 'customize:header'),
-      customizeCss: await crowi.configManager.getConfig('crowi', 'customize:header'),
+      customizeCss: await crowi.configManager.getConfig('crowi', 'customize:css'),
       customizeScript: await crowi.configManager.getConfig('crowi', 'customize:script'),
       customizeScript: await crowi.configManager.getConfig('crowi', 'customize:script'),
     };
     };