From f0d4bfff1364638eefdcf14d0395e64ded9b83e6 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Thu, 29 Jul 2010 14:35:40 -0500
Subject: [PATCH] update Admin with asset even in operations

---
 lib/WebGUI/Session/Style.pm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/WebGUI/Session/Style.pm b/lib/WebGUI/Session/Style.pm
index 54857011f..0b4610f72 100644
--- a/lib/WebGUI/Session/Style.pm
+++ b/lib/WebGUI/Session/Style.pm
@@ -254,14 +254,21 @@ if ($self->session->user->isRegistered || $self->session->setting->get("preventP
 
     # TODO: Figure out if user is still in the admin console
     $var{'head.tags'} .= '<script type="text/javascript">';
-    if ( $session->asset ) {
+    my $asset   = $session->asset;
+
+    # If user is in an operation, find the right asset
+    if ( !$asset && $session->form->get('op') ) {
+        $asset  = WebGUI::Asset->newByUrl( $session );
+    }
+
+    if ( $asset ) {
         my $assetDef    = { 
-            assetId     => $session->asset->getId,
-            title       => $session->asset->getTitle,
-            url         => $session->asset->getUrl,
-            icon        => $session->asset->getIcon(1),
-            type        => $session->asset->assetName,
-            helpers     => $session->asset->getHelpers,
+            assetId     => $asset->getId,
+            title       => $asset->getTitle,
+            url         => $asset->getUrl,
+            icon        => $asset->getIcon(1),
+            type        => $asset->assetName,
+            helpers     => $asset->getHelpers,
         };
         $var{'head.tags'} .= sprintf <<'ADMINJS', JSON->new->encode( $assetDef );
 if ( window.parent && window.parent.admin ) {