Changeset 276 for trunk/grails-app/controllers

Timestamp:

Jan 20, 2010, 8:12:16 AM (15 years ago)

Author:

gav

Message:

Change AssetSubItem to have many assets.

File:

• trunk/grails-app/controllers/AssetSubItemDetailedController.groovy (modified) (4 diffs)

trunk/grails-app/controllers/AssetSubItemDetailedController.groovy ¶

@@ -64 +64 @@
             assetSubItemInstance.properties = params
 
-            if(!assetSubItemInstance.asset && !assetSubItemInstance.parentItem) {
-                flash.message = "Either an asset or parentItem is required."
-                render(view:'edit',model:[assetSubItemInstance:assetSubItemInstance])
-                return
-            }
-
-            if(assetSubItemInstance.asset && assetSubItemInstance.parentItem) {
-            flash.message = "Both an asset and parentItem may not be specified at the same time."
-                render(view:'edit',model:[parentItem:parentItem])
-                return
-            }
+//             if(!assetSubItemInstance.asset && !assetSubItemInstance.parentItem) {
+//                 flash.message = "Either an asset or parentItem is required."
+//                 render(view:'edit',model:[assetSubItemInstance:assetSubItemInstance])
+//                 return
+//             }
+// 
+//             if(assetSubItemInstance.asset && assetSubItemInstance.parentItem) {
+//             flash.message = "Both an asset and parentItem may not be specified at the same time."
+//                 render(view:'edit',model:[parentItem:parentItem])
+//                 return
+//             }
 
             if(!assetSubItemInstance.hasErrors() && assetSubItemInstance.save(flush: true)) {
                 flash.message = "AssetSubItem ${params.id} updated"
 
-                if(assetSubItemInstance.asset)
-                    redirect(controller: "assetDetailed", action:"show", id: assetSubItemInstance.asset.id)
+                if(assetSubItemInstance.assets)
+                    redirect(controller: "assetDetailed", action:"show", id: assetSubItemInstance.assets.toArray()[0].id)
                 else {
                     //Get the top parentItem.
@@ -93 +93 @@
                     }
 
-                    if(parentItem.asset)
-                        redirect(controller: "assetDetailed", action:"show", id: parentItem.asset.id)
+                    if(parentItem?.assets)
+                        redirect(controller: "assetDetailed", action:"show", id: parentItem.assets.toArray()[0].id)
                     else
                         redirect(action:"show", id: assetSubItemInstance.id) // End stop if all else fails.
@@ -118 +118 @@
         def assetSubItemInstance = new AssetSubItem(params)
 
-        if(!assetSubItemInstance.asset && !assetSubItemInstance.parentItem) {
-            flash.message = "Either an asset or parentItem is required."
-            render(view:'create',model:[assetSubItemInstance:assetSubItemInstance])
-            return
-        }
-
-        if(assetSubItemInstance.asset && assetSubItemInstance.parentItem) {
-            flash.message = "Both an asset and parentItem may not be specified at the same time."
-            render(view:'create',model:[assetSubItemInstance:assetSubItemInstance])
-            return
-        }
+//         if(!assetSubItemInstance.asset && !assetSubItemInstance.parentItem) {
+//             flash.message = "Either an asset or parentItem is required."
+//             render(view:'create',model:[assetSubItemInstance:assetSubItemInstance])
+//             return
+//         }
+// 
+//         if(assetSubItemInstance.asset && assetSubItemInstance.parentItem) {
+//             flash.message = "Both an asset and parentItem may not be specified at the same time."
+//             render(view:'create',model:[assetSubItemInstance:assetSubItemInstance])
+//             return
+//         }
 
         if(!assetSubItemInstance.hasErrors() && assetSubItemInstance.save(flush: true)) {
             flash.message = "AssetSubItem ${assetSubItemInstance.id} created"
 
-            if(assetSubItemInstance.asset)
-                redirect(controller: "assetDetailed", action:"show", id: assetSubItemInstance.asset.id)
+            if(assetSubItemInstance.assets)
+                redirect(controller: "assetDetailed", action:"show", id: assetSubItemInstance.assets.toArray()[0].id)
             else {
                 //Get the top parentItem.
@@ -147 +147 @@
                 }
 
-                if(parentItem.asset)
-                    redirect(controller: "assetDetailed", action:"show", id: parentItem.asset.id)
+                if(parentItem?.assets)
+                    redirect(controller: "assetDetailed", action:"show", id: parentItem.assets.toArray()[0].id)
                 else
                     redirect(action:"show", id: assetSubItemInstance.id) // End stop if all else fails.