few more bug fixes and preparing for 7.0.3 release

This commit is contained in:
JT Smith 2006-07-26 20:05:43 +00:00
parent ebc3db0725
commit 07301c12bd
8 changed files with 57 additions and 27 deletions

View file

@ -299,7 +299,10 @@ Returns the extraHeadTags stored in the asset. Called in $self->session->style-
sub getExtraHeadTags {
my $self = shift;
return $self->get("extraHeadTags")."\n".$self->getShortcut->get("extraHeadTags");
my $output = $self->get("extraHeadTags")."\n";
my $shortcut = $self->getShortcut;
$output .= $self->getShortcut->get("extraHeadTags") if defined $shortcut;
return $output;
}
#-------------------------------------------------------------------

View file

@ -115,7 +115,6 @@ sub www_deleteWorkflowActivity {
my $workflow = WebGUI::Workflow->new($session, $session->form->get("workflowId"));
if (defined $workflow) {
$workflow->deleteActivity($session->form->get("activityId"));
$workflow->set({enabled=>0});
}
return www_editWorkflow($session);
}

View file

@ -69,7 +69,7 @@ sub definition {
label=>$i18n->get("run once"),
hoverHelp=>$i18n->get("run once help")
},
workflowId=>{
workflowIdToRun=>{
fieldType=>"workflow",
defaultValue=>undef,
label=>$i18n->get("workflow"),
@ -137,7 +137,7 @@ sub execute {
title=>"Generated by workflow instance ".$instance->getId." (".$self->get("title").")",
enabled=>$self->get("enabled"),
runOnce=>$self->get("runOnce"),
workflowId=>$self->get("workflowId"),
workflowId=>$self->get("workflowIdToRun"),
priority=>$self->get("priority"),
minuteOfHour=>$self->get("minuteOfHour"),
hourOfDay=>$self->get("hourOfDay"),