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

- Added a realtime workflow option for content publishing.

Browse source 
- Added switches to auto request commit operations and skip adding comments.
This commit is contained in:
JT Smith 2007-05-30 16:07:43 +00:00
parent c09b2cae1b
commit 3259da6750
403 changed files with 350 additions and 50605 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/WebGUI/Operation/Settings.pm
View file

@ -77,7 +77,24 @@ sub definition {
defaultValue=>$session->setting->get("defaultVersionTagWorkflow"),
type=>"WebGUI::VersionTag",
label=>$i18n->get("default version tag workflow"),
hoverHelp=>$i18n->get('default version tag workflow help')
hoverHelp=>$i18n->get('default version tag workflow help'),
includeRealtime=>1,
});
push(@fields, {
tab=>"content",
fieldType=>"yesNo",
name=>"autoRequestCommit",
label=>$i18n->get("auto request commit"),
hoverHelp=>$i18n->get("auto request commit help"),
defaultValue=>$session->setting->get("autoRequestCommit")
});
push(@fields, {
tab=>"content",
fieldType=>"yesNo",
name=>"skipCommitComments",
label=>$i18n->get("skip commit comments"),
hoverHelp=>$i18n->get("skip commit comments"),
defaultValue=>$session->setting->get("skipCommitComments")
});
push(@fields, {
tab=>"content",
@ -164,10 +181,10 @@ sub definition {
push(@fields, {
tab=>"content",
fieldType=>"yesNo",
name=>"metaDataEnabled",
label=>$i18n->get("Enable Metadata"),
hoverHelp=>$i18n->get("Enable Metadata description"),
defaultValue=>$session->setting->get("metaDataEnabled")
name=>"metaDataEnabled",
label=>$i18n->get("Enable Metadata"),
hoverHelp=>$i18n->get("Enable Metadata description"),
defaultValue=>$session->setting->get("metaDataEnabled")
});
# user interface settings
push(@fields, {

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

@ -116,7 +116,8 @@ sub www_editVersionTag {
if ($session->user->isInGroup("pbgroup000000000000016")) {
$f->workflow(
value=>$workflowId,
type=>"WebGUI::VersionTag"
type=>"WebGUI::VersionTag",
includeRealtime=>1,
);
$f->group(
value=>[$groupId],
@ -240,13 +241,17 @@ sub www_commitVersionTagConfirm {
if ($tagId) {
my $tag = WebGUI::VersionTag->new($session, $tagId);
if (defined $tag && $session->user->isInGroup($tag->get("groupToUse"))) {
$tag->set({comments=>$session->form->process("comments", "textarea")});
$tag->requestCommit;
my $i18n = WebGUI::International->new($session, "VersionTag");
my $ac = WebGUI::AdminConsole->new($session,"versions");
$tag->set({comments=>$session->form->process("comments", "textarea")});
eval { $tag->requestCommit; };
my $error = "";
if ($@) {
$error .= $i18n->get("bad commit")." ".$@;
}
my $ac = WebGUI::AdminConsole->new($session,"versions");
my $default = WebGUI::Asset->getDefault($session);
return $ac->render(
'<p>'.$i18n->get("commit accepted").'</p>'
$error.'<p>'.$i18n->get("commit accepted").'</p>'
.'<ul>
<li><a href="'.$default->getUrl.'">'.$i18n->get("back to home").'</a></li>
<li><a href="'.$default->getUrl("op=manageVersions").'">'.$i18n->get("manage versions").'</a></li>

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

@ -199,22 +199,21 @@ sub www_editWorkflow {
label=>$i18n->get("is enabled"),
hoverHelp=>$i18n->get("is enabled help")
);
$f->yesNo(
name=>"isSingleton",
value=>$workflow->get("isSingleton"),
defaultValue=>0,
label=>$i18n->get("is singleton"),
hoverHelp=>$i18n->get("is singleton help")
);
$f->yesNo(
name=>"isSerial",
value=>$workflow->get("isSerial"),
defaultValue=>0,
label=>$i18n->get("is serial"),
hoverHelp=>$i18n->get("is serial help")
$f->selectBox(
name=>"mode",
options=>{
singleton=>$i18n->get("singleton"),
parallel=>$i18n->get("parallel"),
serial=>$i18n->get("serial"),
realtime=>$i18n->get("realtime"),
},
value=>$workflow->get("mode") || "parallel",
defaultValue=>"parallel",
label=>$i18n->get("mode"),
hoverHelp=>$i18n->get("mode help")
);
$f->submit;
my $steps = '<div style="clear:both"></div><table class="content">';
my $steps = '<table class="content">';
my $rs = $session->db->read("select activityId, title from WorkflowActivity where workflowId=? order by sequenceNumber",[$workflow->getId]);
while (my ($id, $title) = $rs->array) {
$steps .= '<tr><td>'
@ -224,7 +223,7 @@ sub www_editWorkflow {
.$session->icon->moveUp("op=promoteWorkflowActivity;workflowId=".$workflow->getId.";activityId=".$id)
.'</td><td>'.$title.'</td></tr>';
}
$steps .= '</table>';
$steps .= '</table><div style="clear: both;"></div>';
my $ac = WebGUI::AdminConsole->new($session,"workflow");
$ac->addSubmenuItem($session->url->page("op=addWorkflow"), $i18n->get("add a new workflow"));
$ac->addSubmenuItem($session->url->page("op=manageWorkflows"), $i18n->get("manage workflows"));
@ -247,8 +246,7 @@ sub www_editWorkflowSave {
my $workflow = WebGUI::Workflow->new($session, $session->form->param("workflowId"));
$workflow->set({
enabled => $session->form->get("enabled", "yesNo"),
isSingleton => $session->form->get("isSingleton", "yesNo"),
isSerial => $session->form->get("isSerial", "yesNo"),
mode => $session->form->get("mode"),
title => $session->form->get("title"),
description => $session->form->get("description", "textarea"),
});