Merge branch 'master' into staging

Leandro Santos
2 parents f018baef 452475b0
Showing 2 changed files with 3 additions and 2 deletions Show diff stats
src/app/layout/blocks/communities-block/communities-block.component.ts
src/lib/ng-noosfero-api/interfaces/block.ts
@@ -16,7 +16,7 @@ export class CommunitiesBlockComponent {
     constructor(private communityService: CommunityService) { }
  
     ngOnInit() {
-        let limit = ((this.block && this.block['settings']) ? this.block['settings'].limit : null) || 5;
+        let limit: number = ((this.block && this.block.settings) ? this.block.settings.limit : null) || 5;
  
         this.communityService.list(null, { limit: limit }).then((result: noosfero.RestResult<noosfero.Community[]>) => {
             this.profiles = result.data;
 namespace noosfero {
     export interface Block {
         id: number;
+        settings: any;
     }
-}
 \ No newline at end of file
+}
...	...	@@ -16,7 +16,7 @@ export class CommunitiesBlockComponent {
16	16	constructor(private communityService: CommunityService) { }
17	17
18	18	ngOnInit() {
19		- let limit = ((this.block && this.block['settings']) ? this.block['settings'].limit : null) \|\| 5;
	19	+ let limit: number = ((this.block && this.block.settings) ? this.block.settings.limit : null) \|\| 5;
20	20
21	21	this.communityService.list(null, { limit: limit }).then((result: noosfero.RestResult<noosfero.Community[]>) => {
22	22	this.profiles = result.data;
...	...
1	1	namespace noosfero {
2	2	export interface Block {
3	3	id: number;
	4	+ settings: any;
4	5	}
5		-}
6	6	\ No newline at end of file
	7	+}
...	...