- add: Move revisions from one version tag to another
- add: Delete multiple revisions from a version tag at the same time
- add: Approval activities now have a better parent class and more
flexibility (multiple groups to approve, do on approve)
- fix: weirdness in upgrade file
This commit is contained in:
parent
ca9278190e
commit
ab0b1b2200
10 changed files with 640 additions and 198 deletions
|
|
@ -100,6 +100,9 @@ sub definition {
|
|||
none=>{
|
||||
defaulValue=>0
|
||||
},
|
||||
noneLabel => {
|
||||
defaultValue => $i18n->get("form control none label"),
|
||||
},
|
||||
includeRealtime => {
|
||||
defaultValue => 0
|
||||
},
|
||||
|
|
@ -153,11 +156,16 @@ Renders a template picker control.
|
|||
=cut
|
||||
|
||||
sub toHtml {
|
||||
my $self = shift;
|
||||
my $workflowList = WebGUI::Workflow->getList($self->session, $self->get("type"), $self->get("includeRealtime"));
|
||||
$workflowList->{""} = "None" if ($self->get("none"));
|
||||
$self->set("options", $workflowList);
|
||||
return $self->SUPER::toHtml();
|
||||
my $self = shift;
|
||||
my $workflowList = WebGUI::Workflow->getList($self->session, $self->get("type"), $self->get("includeRealtime"));
|
||||
|
||||
if ( $self->get("none") ) {
|
||||
my $noneLabel = $self->get("noneLabel");
|
||||
$workflowList->{""} = $noneLabel;
|
||||
}
|
||||
|
||||
$self->set("options", $workflowList);
|
||||
return $self->SUPER::toHtml();
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -169,13 +177,13 @@ Renders the form field to HTML as a table row complete with labels, subtext, hov
|
|||
=cut
|
||||
|
||||
sub toHtmlWithWrapper {
|
||||
my $self = shift;
|
||||
my $returnUrl = ";proceed=goBackToPage;returnUrl=".$self->session->url->escape($self->session->asset->getUrl) if $self->session->asset;
|
||||
my $buttons;
|
||||
# This edit button will not work with multiple workflows.
|
||||
$buttons .= $self->session->icon->manage("op=manageWorkflows".$returnUrl);
|
||||
$self->set("subtext",$buttons . $self->get("subtext"));
|
||||
return $self->SUPER::toHtmlWithWrapper;
|
||||
my $self = shift;
|
||||
my $returnUrl = ";proceed=goBackToPage;returnUrl=".$self->session->url->escape($self->session->asset->getUrl) if $self->session->asset;
|
||||
my $buttons;
|
||||
# This edit button will not work with multiple workflows.
|
||||
$buttons .= $self->session->icon->manage("op=manageWorkflows".$returnUrl);
|
||||
$self->set("subtext",$buttons . $self->get("subtext"));
|
||||
return $self->SUPER::toHtmlWithWrapper;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue