Fixed + old document service moved to default services.ct since it's …

…not a plugin git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/trunk/core@57153 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
Amirhalfon1 · Feb 3, 2011 · fb21bbb · fb21bbb
1 parent b2a63e4
commit fb21bbb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/api_v3/config/v3_services.ct b/api_v3/config/v3_services.ct
@@ -140,7 +140,7 @@ baseentry.list						|			|1		|1	|1		|2		|1		|	|		|	|   |CONTENT_MANAGE_BASE,CONTE
 baseentry.count						|			|1		|1	|1		|2		|1		|	|		|	|   |CONTENT_MANAGE_BASE,CONTENT_MODERATE_BASE
 baseentry.get						|			|1		|1	|1		|2		|1		|	|		|1	|   |CONTENT_MANAGE_BASE,KMC_READ_ONLY
 baseentry.getcontextdata			|			|1		|1	|1		|2		|1		|	|		|1	|   |CONTENT_MANAGE_BASE,KMC_READ_ONLY
-baseentry.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,LIVE_STREAM_UPDATE
+baseentry.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,LIVE_STREAM_UPDATE
 baseentry.upload					|			|1		|1	|1		|2		|1		|	|		|	|   |CONTENT_INGEST_UPLOAD
 baseentry.getbyids					|			|1		|1	|1		|2		|1		|	|		|	|   |CONTENT_MANAGE_BASE
 baseentry.delete					|			|1		|1	|1		|2		|1		|	|		|	|   |CONTENT_MANAGE_DELETE
@@ -400,4 +400,14 @@ permission.get						|			|2		|1	|0		|0		|1		|	|		|	|   |ADMIN_BASE
 permission.list						|			|2		|1	|0		|0		|1		|	|		|	|   |ADMIN_BASE,KMC_READ_ONLY
 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.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
+document.convertppttoswf			|			|1		|1	|1		|2		|1		|rw	|		|	|   |CONTENT_MANAGE_RECONVERT
+document.serve						|			|0		|0	|0		|0		|1		|r	|		|	|   |CONTENT_MANAGE_BASE
+document.servebyflavorparamsid		|			|0		|0	|0		|0		|1		|r	|		|	|   |CONTENT_MANAGE_BASE
+
 ---------------------------------------------------------------------------------------------------
diff --git a/plugins/document/config/document.ct b/plugins/document/config/document.ct
@@ -25,20 +25,11 @@ 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_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
 documents.convertppttoswf			|			|1		|1	|1		|2		|1		|rw	|		|	|   |CONTENT_MANAGE_RECONVERT
 documents.serve						|			|0		|0	|0		|0		|1		|r	|		|	|   |CONTENT_MANAGE_BASE
 documents.servebyflavorparamsid		|			|0		|0	|0		|0		|1		|r	|		|	|   |CONTENT_MANAGE_BASE
 
-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.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
-document.convertppttoswf			|			|1		|1	|1		|2		|1		|rw	|		|	|   |CONTENT_MANAGE_RECONVERT
-document.serve						|			|0		|0	|0		|0		|1		|r	|		|	|   |CONTENT_MANAGE_BASE
-document.servebyflavorparamsid		|			|0		|0	|0		|0		|1		|r	|		|	|   |CONTENT_MANAGE_BASE