From c7a4c73e6b6d41b8cc637f121589b8e82be2e0bb Mon Sep 17 00:00:00 2001 From: Roy Johnson Date: Sun, 27 Aug 2006 18:55:14 +0000 Subject: [PATCH] Changed behavior of Image assets when admin mode is on so that browsing to an images url no longer takes you to the assets edit screen, but rather to the image it's self. --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/File/Image.pm | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 0b52d8ee0..5ffc026b5 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -5,6 +5,7 @@ constraints (Martin Kamerbeek / Procolix) - fix: Add event does not work WebGUI 7.0.5 in combination with Proxy Caching turned off (Wouter van Oijen / ProcoliX) + - When going to an image by it's webgui url in admin mode, you are now shown the image instead of being taken to the edit screen for the image. 7.0.6 - fix: Error in DateTime.pm diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm index c325fbc86..78da95fbf 100644 --- a/lib/WebGUI/Asset/File/Image.pm +++ b/lib/WebGUI/Asset/File/Image.pm @@ -307,9 +307,6 @@ A web executable method that redirects the user to the specified page, or displa sub www_view { my $self = shift; - if ($self->session->var->get("adminOn")) { - return $self->www_edit; - } my $storage = $self->getStorageLocation; $self->session->http->setRedirect($storage->getUrl($self->get("filename"))); $self->session->http->setStreamedFile($storage->getPath($self->get("filename")));