Skip to content

Commit

Permalink
CONTENT_MODERATE_METADATA updated to include all permission items tha…
Browse files Browse the repository at this point in the history 
…t are inside CONTENT_MANAGE_METADATA, makiung them practically the same as requested by Chen.

Fix for ticket kaltura#9224 

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/trunk/core@57625 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
  • Loading branch information
dori committed Feb 13, 2011
1 parent b0ac8e7 commit 48c3ad8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions api_v3/config/v3_services.ct
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ media.get | |1 |1 |1 |2 |1 | | |1 | |CONTENT_MANAGE_BASE
media.convert | |1 |1 |1 |2 |1 | | |1 | |CONTENT_MANAGE_RECONVERT
media.addfromentry | |1 |1 |1 |2 |1 | | |1 | |CONTENT_INGEST_UPLOAD
media.addfromflavorasset | |1 |1 |1 |2 |1 | | |1 | |CONTENT_INGEST_UPLOAD
media.update | |1 |1 |1 |2 |1 | | | | |CONTENT_MANAGE_METADATA,CONTENT_MANAGE_ASSIGN_CATEGORIES,CONTENT_MANAGE_THUMBNAIL,CONTENT_MANAGE_SCHEDULE,CONTENT_MANAGE_ACCESS_CONTROL
media.update | |1 |1 |1 |2 |1 | | | | |CONTENT_MANAGE_METADATA,CONTENT_MODERATE_METADATA,CONTENT_MANAGE_ASSIGN_CATEGORIES,CONTENT_MANAGE_THUMBNAIL,CONTENT_MANAGE_SCHEDULE,CONTENT_MANAGE_ACCESS_CONTROL
media.upload | |1 |1 |1 |2 |1 | | | | |CONTENT_INGEST_UPLOAD
media.delete | |1 |1 |1 |2 |1 | | | | |CONTENT_MANAGE_DELETE
media.list | |1 |1 |1 |2 |1 | | | | |CONTENT_MANAGE_BASE,CONTENT_MODERATE_BASE,PLAYLIST_BASE,PLAYLIST_ADD,PLAYLIST_UPDATE
Expand Down Expand Up @@ -130,7 +130,7 @@ mixing.anonymousrank | |1 |1 |1 |2 |1 | | | | |CONTENT_MODERATE_META

data.add | |1 |1 |1 |2 |1 | | | | |CONTENT_INGEST_UPLOAD
data.get | |1 |1 |1 |2 |1 | | |1 | |CONTENT_MANAGE_BASE
data.update | |1 |1 |1 |2 |1 | | | | |CONTENT_MANAGE_METADATA,CONTENT_MANAGE_ASSIGN_CATEGORIES,CONTENT_MANAGE_THUMBNAIL,CONTENT_MANAGE_SCHEDULE,CONTENT_MANAGE_ACCESS_CONTROL
data.update | |1 |1 |1 |2 |1 | | | | |CONTENT_MANAGE_METADATA,CONTENT_MODERATE_METADATA,CONTENT_MANAGE_ASSIGN_CATEGORIES,CONTENT_MANAGE_THUMBNAIL,CONTENT_MANAGE_SCHEDULE,CONTENT_MANAGE_ACCESS_CONTROL
data.delete | |1 |1 |1 |2 |1 | | | | |CONTENT_MANAGE_DELETE
data.list | |1 |1 |1 |2 |1 | | | | |CONTENT_MANAGE_BASE,CONTENT_MODERATE_BASE,PLAYLIST_BASE,PLAYLIST_ADD,PLAYLIST_UPDATE
data.serve | |1 |1 |1 |2 |1 | | | | |CONTENT_MANAGE_BASE
Expand Down Expand Up @@ -405,7 +405,7 @@ permission.getcurrentpermissions | |0 |1 |0 |0 |1 | | | | |

document.addfromuploadedfile | |1 |1 |1 |2 |1 |rw | | | |CONTENT_INGEST_UPLOAD
document.get | |1 |1 |1 |2 |1 |r | |1 | |CONTENT_MANAGE_BASE
document.update | |1 |1 |1 |2 |1 |rw | | | |CONTENT_MANAGE_METADATA,CONTENT_MANAGE_ASSIGN_CATEGORIES,CONTENT_MANAGE_THUMBNAIL,CONTENT_MANAGE_SCHEDULE,CONTENT_MANAGE_ACCESS_CONTROL
document.update | |1 |1 |1 |2 |1 |rw | | | |CONTENT_MANAGE_METADATA,CONTENT_MODERATE_METADATA,CONTENT_MANAGE_ASSIGN_CATEGORIES,CONTENT_MANAGE_THUMBNAIL,CONTENT_MANAGE_SCHEDULE,CONTENT_MANAGE_ACCESS_CONTROL
document.delete | |1 |1 |1 |2 |1 |rw | | | |CONTENT_MANAGE_DELETE
document.list | |1 |1 |1 |2 |1 |r | | | |CONTENT_MANAGE_BASE
document.upload | |1 |1 |1 |2 |1 |rw | | | |CONTENT_INGEST_UPLOAD
Expand Down
6 changes: 3 additions & 3 deletions deployment/updates/scripts/03_roles_and_permissions_2/03_add_parameter_permission_items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
array('object' => 'KalturaBaseEntry', 'parameter' => 'categories', 'action' => ApiParameterPermissionItemAction::UPDATE, 'permission' => PermissionName::CONTENT_MANAGE_ASSIGN_CATEGORIES.','.PermissionName::USER_SESSION_PERMISSION),
array('object' => 'KalturaBaseEntry', 'parameter' => 'categoriesIds', 'action' => ApiParameterPermissionItemAction::INSERT, 'permission' => PermissionName::CONTENT_MANAGE_ASSIGN_CATEGORIES.','.PermissionName::USER_SESSION_PERMISSION),
array('object' => 'KalturaBaseEntry', 'parameter' => 'categoriesIds', 'action' => ApiParameterPermissionItemAction::UPDATE, 'permission' => PermissionName::CONTENT_MANAGE_ASSIGN_CATEGORIES.','.PermissionName::USER_SESSION_PERMISSION),
array('object' => 'KalturaBaseEntry', 'parameter' => 'name', 'action' => ApiParameterPermissionItemAction::UPDATE, 'permission' => PermissionName::CONTENT_MANAGE_METADATA.','.PermissionName::USER_SESSION_PERMISSION),
array('object' => 'KalturaBaseEntry', 'parameter' => 'tags', 'action' => ApiParameterPermissionItemAction::UPDATE, 'permission' => PermissionName::CONTENT_MANAGE_METADATA.','.PermissionName::USER_SESSION_PERMISSION),
array('object' => 'KalturaBaseEntry', 'parameter' => 'description', 'action' => ApiParameterPermissionItemAction::UPDATE, 'permission' => PermissionName::CONTENT_MANAGE_METADATA.','.PermissionName::USER_SESSION_PERMISSION),
array('object' => 'KalturaBaseEntry', 'parameter' => 'name', 'action' => ApiParameterPermissionItemAction::UPDATE, 'permission' => PermissionName::CONTENT_MANAGE_METADATA.','.PermissionName::USER_SESSION_PERMISSION.','.PermissionName::CONTENT_MODERATE_METADATA),
array('object' => 'KalturaBaseEntry', 'parameter' => 'tags', 'action' => ApiParameterPermissionItemAction::UPDATE, 'permission' => PermissionName::CONTENT_MANAGE_METADATA.','.PermissionName::USER_SESSION_PERMISSION.','.PermissionName::CONTENT_MODERATE_METADATA),
array('object' => 'KalturaBaseEntry', 'parameter' => 'description', 'action' => ApiParameterPermissionItemAction::UPDATE, 'permission' => PermissionName::CONTENT_MANAGE_METADATA.','.PermissionName::USER_SESSION_PERMISSION.','.PermissionName::CONTENT_MODERATE_METADATA),
array('object' => 'KalturaLiveStreamAdminEntry', 'parameter' => kApiParameterPermissionItem::ALL_VALUES_IDENTIFIER, 'action' => ApiParameterPermissionItemAction::READ, 'permission' => PermissionName::CONTENT_MANAGE_BASE),
array('object' => 'KalturaLiveStreamAdminEntry', 'parameter' => kApiParameterPermissionItem::ALL_VALUES_IDENTIFIER, 'action' => ApiParameterPermissionItemAction::INSERT, 'permission' => PermissionName::CONTENT_MANAGE_BASE),
array('object' => 'KalturaLiveStreamAdminEntry', 'parameter' => kApiParameterPermissionItem::ALL_VALUES_IDENTIFIER, 'action' => ApiParameterPermissionItemAction::UPDATE, 'permission' => PermissionName::CONTENT_MANAGE_BASE),
Expand Down
2 changes: 1 addition & 1 deletion plugins/document/config/document.ct
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ documents.convert | |1 |1 |1 |2 |1 | | |1 | |CONTENT_MANAGE_RECONVE
documents.addfromentry | |1 |1 |1 |2 |1 | | |1 | |CONTENT_INGEST_UPLOAD
documents.addfromflavorasset | |1 |1 |1 |2 |1 | | |1 | |CONTENT_INGEST_UPLOAD
documents.get | |1 |1 |1 |2 |1 |r | |1 | |CONTENT_MANAGE_BASE
documents.update | |1 |1 |1 |2 |1 |rw | | | |CONTENT_MANAGE_METADATA,CONTENT_MANAGE_ASSIGN_CATEGORIES,CONTENT_MANAGE_THUMBNAIL,CONTENT_MANAGE_SCHEDULE,CONTENT_MANAGE_ACCESS_CONTROL
documents.update | |1 |1 |1 |2 |1 |rw | | | |CONTENT_MANAGE_METADATA,CONTENT_MODERATE_METADATA,CONTENT_MANAGE_ASSIGN_CATEGORIES,CONTENT_MANAGE_THUMBNAIL,CONTENT_MANAGE_SCHEDULE,CONTENT_MANAGE_ACCESS_CONTROL
documents.delete | |1 |1 |1 |2 |1 |rw | | | |CONTENT_MANAGE_DELETE
documents.list | |1 |1 |1 |2 |1 |r | | | |CONTENT_MANAGE_BASE
documents.upload | |1 |1 |1 |2 |1 |rw | | | |CONTENT_INGEST_UPLOAD
Expand Down

0 comments on commit 48c3ad8

Please sign in to comment.