oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forward port fix for Form/Template manage button, when template's parent is

Browse source 
checked out and not committed.
This commit is contained in:
Colin Kuskie 2008-12-17 04:38:16 +00:00
parent a30f940db1
commit 946ecd0fc3
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/changelog/7.x.x.txt
View file

@ -1,5 +1,6 @@
7.6.8
- Updated captcha images to be more legible.
- fixed #9285: modifing template prevents edit of syncontent
7.6.7
- fixed #9263: Thingy possibleValues processing, and List type autodetection.
@ -18,8 +19,7 @@
- fixed #8898: versioning problem
- fixed #9315: Password Recovery
- fixed #9298: Inconsistent date formats
- fixed #9296: Thingy View template not recognising field_isVisible (SDH
Consulting Group)
- fixed #9296: Thingy View template not recognising field_isVisible (SDH Consulting Group)
7.6.6
- fixed #8792: Image Preview gives ERROR in Collateral Manager

26
lib/WebGUI/Form/Template.pm
View file

@ -168,18 +168,22 @@ Renders the form field to HTML as a table row complete with labels, subtext, hov
=cut
sub toHtmlWithWrapper {
my $self = shift;
my $template = WebGUI::Asset::Template->new($self->session,$self->getOriginalValue());
my $self = shift;
my $session = $self->session;
my $template = WebGUI::Asset::Template->new($session,$self->getOriginalValue());
if (defined $template && $template->canEdit) {
my $returnUrl;
if (defined $self->session->asset && ref $self->session->asset ne "WebGUI::Asset::Template") {
$returnUrl = ";proceed=goBackToPage;returnUrl=".$self->session->url->escape($self->session->asset->getUrl);
}
my $buttons = $self->session->icon->edit("func=edit".$returnUrl,$template->get("url"));
$buttons .= $self->session->icon->manage("op=assetManager",$template->getParent->get("url"));
$self->set("subtext",$buttons . $self->get("subtext"));
}
return $self->SUPER::toHtmlWithWrapper;
my $returnUrl;
if (defined $session->asset && ref $session->asset ne "WebGUI::Asset::Template") {
$returnUrl = ";proceed=goBackToPage;returnUrl=".$session->url->escape($self->session->asset->getUrl);
}
my $buttons = $session->icon->edit("func=edit".$returnUrl,$template->get("url"));
my $parent = $template->getParent();
if (defined $parent) {
$buttons .= $session->icon->manage("op=assetManager",$template->getParent->get("url"));
}
$self->set("subtext",$buttons . $self->get("subtext"));
}
return $self->SUPER::toHtmlWithWrapper;
}
1;