Changeset 325 for trunk

Timestamp:

Feb 8, 2010, 3:43:08 AM (15 years ago)

Author:

gav

Message:

Allow ROLE_AssetUser to view the asset tree.
Some commenting and correct taskSearchParamsMax to assetSearchParamsMax.

File:

• trunk/grails-app/controllers/AssetDetailedController.groovy (modified) (5 diffs)

trunk/grails-app/controllers/AssetDetailedController.groovy

@@ -17 +17 @@
     def index = { redirect(action:search,params:params) }
 
-    def importAssetTree = {
-    }
-
+    /**
+    * Build and return the asset tree response for the AJAX request.
+    */
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
     def assetTree = {
         def s = assetTreeService.buildAssetTree(params, session)
@@ -28 +29 @@
     * Save the asset tree status in the current http session.
     */
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
     def saveAssetTreeStatus = {
         session.assetTreeVisibleBranches = params.assetTreeVisibleBranches
     }
 
+    /**
+    * Disaply the import view.
+    */
+    def importAssetTree = {
+    }
+
+    /**
+    * Handle the import save.
+    */
     def importAssetTreeSave = {
         def result = csvService.importAssetTree(request)
@@ -56 +67 @@
     }
 
+    /**
+    * Export a csv test file.
+    */
     def exportAssetTreeTest = {
         response.contentType = ConfigurationHolder.config.grails.mime.types["csv"]
@@ -64 +78 @@
 
     /**
-    * Export the entire asset tree.
+    * Export the entire asset tree as a csv file.
     */
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
@@ -92 +106 @@
     def search = {
 
-        if(session.taskSearchParamsMax)
-            params.max = session.taskSearchParamsMax
+        if(session.assetSearchParamsMax)
+            params.max = session.assetSearchParamsMax
 
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  1000)