Просмотр исходного кода

fix api condition and api return variable

kntowd 5 лет назад
Родитель
Сommit
cb9257611d
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      src/client/js/components/StaffCredit/StaffCredit.jsx
  2. 2 2
      src/server/routes/apiv3/staffs.js

+ 1 - 1
src/client/js/components/StaffCredit/StaffCredit.jsx

@@ -87,7 +87,7 @@ class StaffCredit extends React.Component {
 
 
   async componentDidMount() {
   async componentDidMount() {
     const res = await this.props.appContainer.apiv3Get('/staffs');
     const res = await this.props.appContainer.apiv3Get('/staffs');
-    const contributors = res.data.contributorsCache;
+    const contributors = res.data.contributors;
     this.setState({ contributors });
     this.setState({ contributors });
 
 
     setTimeout(() => {
     setTimeout(() => {

+ 2 - 2
src/server/routes/apiv3/staffs.js

@@ -21,7 +21,7 @@ module.exports = (crowi) => {
     const now = new Date();
     const now = new Date();
     const growiCloudUri = await crowi.configManager.getConfig('crowi', 'app:growiCloudUri');
     const growiCloudUri = await crowi.configManager.getConfig('crowi', 'app:growiCloudUri');
 
 
-    if (expiredAt == null || isAfter(now, expiredAt) || growiCloudUri != null) {
+    if ((expiredAt == null || isAfter(now, expiredAt)) && growiCloudUri != null) {
       const url = new URL('_api/staffCredit', growiCloudUri);
       const url = new URL('_api/staffCredit', growiCloudUri);
       const growiContributors = contributors.slice(0, 1);
       const growiContributors = contributors.slice(0, 1);
       const otherContributors = contributors.slice(1);
       const otherContributors = contributors.slice(1);
@@ -37,7 +37,7 @@ module.exports = (crowi) => {
         logger.warn('Getting GROWI.cloud staffcredit is failed');
         logger.warn('Getting GROWI.cloud staffcredit is failed');
       }
       }
     }
     }
-    return res.apiv3({ contributorsCache });
+    return res.apiv3({ contributors: contributorsCache });
   });
   });
 
 
   return router;
   return router;