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

more workflow bug fixes

Browse source
This commit is contained in:
JT Smith 2006-03-30 16:37:57 +00:00
parent 046088fedd
commit bad8616f08
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -463,6 +463,7 @@ sub getEditForm {
); );
$tabform->getTab("security")->workflow( $tabform->getTab("security")->workflow(
-name=>"approvalWorkflow", -name=>"approvalWorkflow",
-type=>"WebGUI::VersionTag",
-label=>$i18n->get('approval workflow'), -label=>$i18n->get('approval workflow'),
-hoverHelp=>$i18n->get('approval workflow description'), -hoverHelp=>$i18n->get('approval workflow description'),
-value=>[$self->getValue("approvalWorkflow")] -value=>[$self->getValue("approvalWorkflow")]

5
lib/WebGUI/Operation/VersionTag.pm
View file

@ -233,11 +233,12 @@ sub www_commitVersionTagConfirm {
$tag->requestCommit; $tag->requestCommit;
my $i18n = WebGUI::International->new($session, "VersionTag"); my $i18n = WebGUI::International->new($session, "VersionTag");
my $ac = WebGUI::AdminConsole->new($session,"versions"); my $ac = WebGUI::AdminConsole->new($session,"versions");
my $default = WebGUI::Asset->getDefault($session);
return $ac->render( return $ac->render(
'<p>'.$i18n->get("commit accepted").'</p>' '<p>'.$i18n->get("commit accepted").'</p>'
.'<ul> .'<ul>
<li><a href="'.$session->url->page.'">'.$i18n->get("493","WebGUI").'</a></li> <li><a href="'.$default->getUrl.'">'.$i18n->get("493","WebGUI").'</a></li>
<li><a href="'.$session->url->page("op=manageVersions").'">'.$i18n->get("manage versions").'</a></li> <li><a href="'.$default->getUrl("op=manageVersions").'">'.$i18n->get("manage versions").'</a></li>
</ul>' </ul>'
); );
} }

1
lib/WebGUI/Operation/Workflow.pm
View file

@ -363,6 +363,7 @@ sub www_runWorkflow {
if (defined $instance) { if (defined $instance) {
return $instance->run; return $instance->run;
} }
return "complete";
} }
return "error"; return "error";
} }