Ver código fonte

Merge branch 'develop' of github.com:tracim/tracim_front into develop

AlexiCauvin 6 anos atrás
pai
commit
47eb41b88e
2 arquivos alterados com 3 adições e 3 exclusões
  1. 1 1
      src/appFactory.js
  2. 2 2
      src/reducer/contentType.js

+ 1 - 1
src/appFactory.js Ver arquivo

37
           renderApp={this.renderApp}
37
           renderApp={this.renderApp}
38
           renderCreateContentApp={this.renderCreateContentApp}
38
           renderCreateContentApp={this.renderCreateContentApp}
39
           emitEventApp={this.emitEventApp}
39
           emitEventApp={this.emitEventApp}
40
-          hideApp={this.hideApp}
40
+          // hideApp={this.hideApp}
41
         />
41
         />
42
       )
42
       )
43
     }
43
     }

+ 2 - 2
src/reducer/contentType.js Ver arquivo

12
         availableStatuses: ct.available_statuses.map(as => ({
12
         availableStatuses: ct.available_statuses.map(as => ({
13
           label: as.label,
13
           label: as.label,
14
           slug: as.slug,
14
           slug: as.slug,
15
-          fa_icon: as.fa_icon,
15
+          faIcon: as.fa_icon,
16
           hexcolor: as.hexcolor,
16
           hexcolor: as.hexcolor,
17
-          global_status: as.global_status
17
+          globalStatus: as.global_status
18
         }))
18
         }))
19
       }))
19
       }))
20
 
20