From cffe57f0a8314c05dbf8fbcc9c856c13d282f855 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 16 Mar 2006 19:13:41 +0000
Subject: [PATCH] don't need/want chunking on dashboard asset

---
 lib/WebGUI/Asset/Wobject.pm           | 11 ++++----
 lib/WebGUI/Asset/Wobject/Dashboard.pm | 40 +++++++++++++--------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm
index a4dcbe41d..7f276d670 100644
--- a/lib/WebGUI/Asset/Wobject.pm
+++ b/lib/WebGUI/Asset/Wobject.pm
@@ -566,7 +566,7 @@ sub www_edit {
 
 #-------------------------------------------------------------------
 
-=head2 www_view ( [ disableCache ] )
+=head2 www_view (  )
 
 Renders self->view based upon current style, subject to timeouts. Returns Privilege::noAccess() if canView is False.
 
@@ -588,10 +588,11 @@ sub www_view {
 			return WebGUI::Asset->getNotFound($self->session)->www_view;
 		}
 	}
-	if ($self->get("encryptPage") && $self->session->env->get("HTTPS") ne "on") {
-                $self->session->http->setRedirect($self->getUrl);
-                return "";
-        }
+# causes problems with the wre so it's commented out
+#	if ($self->get("encryptPage") && $self->session->env->get("HTTPS") ne "on") {
+ #               $self->session->http->setRedirect($self->getUrl);
+  #              return "";
+   #     }
 	$self->logView();
 	# must find a way to do this next line better
 	$self->session->http->setCookie("wgSession",$self->session->var->{_var}{sessionId}) unless $self->session->var->{_var}{sessionId} eq $self->session->http->getCookies->{"wgSession"};
diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm
index 53643567b..c27fd6189 100644
--- a/lib/WebGUI/Asset/Wobject/Dashboard.pm
+++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm
@@ -156,22 +156,6 @@ sub isManaging {
 	return 0;
 }
 
-#-------------------------------------------------------------------
-
-=head2 prepareView ( )
-
-See WebGUI::Asset::prepareView() for details.
-
-=cut
-
-sub prepareView {
-	my $self = shift;
-	$self->SUPER::prepareView();
-	my $template = WebGUI::Asset::Template->new($self->session, $self->get("templateId"));
-	$template->prepare;
-	$self->{_viewTemplate} = $template;
-}
-
 
 #-------------------------------------------------------------------
 sub processPropertiesFromFormPost {
@@ -301,18 +285,32 @@ sub www_setContentPositions {
 
 #-------------------------------------------------------------------
 
-=head2 www_view ( )
+=head2 www_view (  )
 
-Returns the view() method of the asset object if the requestor canView.
+Renders self->view based upon current style, subject to timeouts. Returns Privilege::noAccess() if canView is False.
 
 =cut
 
 sub www_view {
-	my $self = shift;
-	return $self->SUPER::www_view(1);
+        my $self = shift;
+        unless ($self->canView) {
+                if ($self->get("state") eq "published") { # no privileges, make em log in
+                        return $self->session->privilege->noAccess();
+                } elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^trash/) { # show em trash
+                        $self->session->http->setRedirect($self->getUrl("func=manageTrash"));
+                        return "";
+                } elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^clipboard/) { # show em clipboard
+                        $self->session->http->setRedirect($self->getUrl("func=manageClipboard"));
+                        return "";
+                } else { # tell em it doesn't exist anymore
+                        $self->session->http->setStatus("410");
+                        return WebGUI::Asset->getNotFound($self->session)->www_view;
+                }
+        }
+        $self->logView();
+        my $style = $self->processStyle($self->view);
 }
 
 
 
-
 1;