#19745697 trash module devlopement

Document Status DB Column added, and Document module refactoring


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8401 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/trash/conf/module.xml

@@ -2,9 +2,11 @@
 <module>
     <grants />
     <permissions>
+        <permission action="dispTrashAdminList" target="manager" />
+        <permission action="procTrashAdminEmptyTrash" target="manager" />
+        <permission action="procTrashAdminRestore" target="manager" />
     </permissions>
     <actions>
-        <action name="dispTrash" type="view" standalone="true" />
         <action name="dispTrashAdminList" type="view" standalone="true" admin_index="true" />
 
         <action name="procTrashAdminEmptyTrash" type="controller" standalone="true" />

modules/trash/trash.controller.php

@@ -6,25 +6,6 @@
  **/
 class trashController extends trash
 {
-	/**
-	 * @brief object insert to trash
-	 **/
-	function insertTrash($oTrashVO)
-	{
-		$output = executeQuery('trash.insertTrash', $oTrashVO);
-		debugPrint($output);
-		return $output;
-	}
-
-	/**
-	 * @brief empty trash
-	 * @param trashSrls : trash_srl in array
-	 **/
-	function emptyTrash($trashSrls)
-	{
-		if(!is_array($trashSrls)) return false;
-		executeQuery('trash.deleteTrash', $trashSrls);
-	}
 }
 
 /* End of file trash.controller.php */

modules/trash/trash.view.php

@@ -12,24 +12,5 @@ class trashView extends trash {
 	 **/
 	function init() {
 	}
-
-	/**
-	 * @brief 
-	 **/
-	function dispTrash() {
-		$trashSrl = Context::get('trashSrl');
-		debugPrint($trashSrl);
-
-		$oWastebasketModel = getModel('trash');
-		$output = $oWastebasketModel->getTrash($trashSrl);
-	}
-
-	/**
-	 * @brief 
-	 **/
-	function dispTrashList() {
-		$oWastebasketModel = getModel('trash');
-		$output = $oWastebasketModel->getTrashList();
-	}
 }
 ?>