Ábner Oliveira · Leandro Santos · Leandro Santos · Ábner Oliveira · Leandro Santos
Showing 4 changed files Show diff stats
src/app/shared/services/permission.service.ts
src/lib/ng-noosfero-api/interfaces/article.ts
src/lib/ng-noosfero-api/interfaces/comment.ts
src/lib/ng-noosfero-api/interfaces/profile.ts
 import {Injectable, Inject} from "ng-forward";
  
-type WithPermissions = noosfero.Profile | noosfero.Comment | noosfero.Article;
-
 @Injectable()
 export class PermissionService {
-    isAllowed(target: WithPermissions, permission: string) {
+    isAllowed(target: noosfero.ModelWithPermissions, permission: string) {
         return (target.permissions || []).indexOf(permission) >= 0;
     }
  
  
 namespace noosfero {
-    export interface Article extends RestModel {
+    export interface Article extends RestModel, ModelWithPermissions {
         abstract: string;
         path: string;
         profile: Profile;
@@ -16,7 +16,5 @@ namespace noosfero {
         start_date: string;
         end_date: string;
         accept_comments: boolean;
-
-        permissions: string[];
     }
 }
 namespace noosfero {
-    export interface Comment extends RestModel {
+    export interface Comment extends RestModel, ModelWithPermissions {
         source_id: number;
         reply_of_id: number;
         reply_of: Comment;
         replies: Comment[];
         body: string;
-        permissions: string[];
     }
  
     export interface CommentViewModel extends Comment {
@@ -6,7 +6,7 @@ namespace noosfero {
  * @description
  *  A representation of a Noosfero Profile.
  */
-    export interface Profile extends RestModel {
+    export interface Profile extends RestModel, ModelWithPermissions {
         /**
          * @ngdoc property
          * @name id
@@ -79,8 +79,6 @@ namespace noosfero {
          */
         custom_footer: string;
  
-        permissions: string[];
-
         /**
          * @ngdoc property
          * @name layout_template
1	1	import {Injectable, Inject} from "ng-forward";
2	2
3		-type WithPermissions = noosfero.Profile \| noosfero.Comment \| noosfero.Article;
4		-
5	3	@Injectable()
6	4	export class PermissionService {
7		- isAllowed(target: WithPermissions, permission: string) {
	5	+ isAllowed(target: noosfero.ModelWithPermissions, permission: string) {
8	6	return (target.permissions \|\| []).indexOf(permission) >= 0;
9	7	}
10	8
...	...
1	1
2	2	namespace noosfero {
3		- export interface Article extends RestModel {
	3	+ export interface Article extends RestModel, ModelWithPermissions {
4	4	abstract: string;
5	5	path: string;
6	6	profile: Profile;
...	...	@@ -16,7 +16,5 @@ namespace noosfero {
16	16	start_date: string;
17	17	end_date: string;
18	18	accept_comments: boolean;
19		-
20		- permissions: string[];
21	19	}
22	20	}
...	...
1	1	namespace noosfero {
2		- export interface Comment extends RestModel {
	2	+ export interface Comment extends RestModel, ModelWithPermissions {
3	3	source_id: number;
4	4	reply_of_id: number;
5	5	reply_of: Comment;
6	6	replies: Comment[];
7	7	body: string;
8		- permissions: string[];
9	8	}
10	9
11	10	export interface CommentViewModel extends Comment {
...	...
...	...	@@ -6,7 +6,7 @@ namespace noosfero {
6	6	* @description
7	7	* A representation of a Noosfero Profile.
8	8	*/
9		- export interface Profile extends RestModel {
	9	+ export interface Profile extends RestModel, ModelWithPermissions {
10	10	/**
11	11	* @ngdoc property
12	12	* @name id
...	...	@@ -79,8 +79,6 @@ namespace noosfero {
79	79	*/
80	80	custom_footer: string;
81	81
82		- permissions: string[];
83		-
84	82	/**
85	83	* @ngdoc property
86	84	* @name layout_template
...	...