Commit b982b5b8c8b89c6953eeaa3bd0386e06a5b3ad03
1 parent
4e13e9c2
Exists in
master
and in
2 other branches
changed to use ModelWithPermissions interface
Showing
4 changed files
with
4 additions
and
11 deletions
Show diff stats
src/app/shared/services/permission.service.ts
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 | ... | ... |
src/lib/ng-noosfero-api/interfaces/article.ts
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 | } | ... | ... |
src/lib/ng-noosfero-api/interfaces/comment.ts
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 { | ... | ... |
src/lib/ng-noosfero-api/interfaces/profile.ts
... | ... | @@ -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 | ... | ... |