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

Merge branch 'feat/4572-get-contributors-with-gc-api' into feat/4573-add-staff-credit-data

# Conflicts:
#	src/client/js/components/StaffCredit/StaffCredit.jsx
ryohi15 5 лет назад
Родитель
Сommit
65c4805810
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      src/client/js/components/StaffCredit/StaffCredit.jsx

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

@@ -26,7 +26,7 @@ class StaffCredit extends React.Component {
     super(props);
     this.state = {
       isShown: true,
-      gcContributors: {},
+      gcContributors: null,
     };
     this.deleteCredit = this.deleteCredit.bind(this);
   }
@@ -60,7 +60,7 @@ class StaffCredit extends React.Component {
 
   renderContributors() {
     if (this.state.isShown) {
-      if (this.state.gcContributors !== {}) {
+      if (this.state.gcContributors != null && contributors[1].sectionName !== 'GROWI-cloud') {
         contributors.splice(1, 0, this.state.gcContributors);
       }
       const credit = contributors.map((contributor) => {