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

more merging of versioning and workflow

Browse source
This commit is contained in:
JT Smith 2006-03-14 22:25:18 +00:00
parent cba26ecc0c
commit 81fc744a8b
8 changed files with 45 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/Macro/AdminBar.pm
View file

@ -98,10 +98,12 @@ sub process {
}
}
my $working = WebGUI::VersionTag->getWorking($session, 1);
my $workingId = "";
my @tags = ();
if ($working) {
$workingId = $working->getId;
push(@tags, {
url=>$session->url->page("op=commitVersionTag;backToSite=1;tagId=".$working->getId),
url=>$session->url->page("op=commitVersionTag;backToSite=1;tagId=".$workingId),
title=>$i18n->get("commit my changes"),
icon=>$session->config->get("extrasURL").'/adminConsole/small/versionTags.gif'
});
@ -110,7 +112,7 @@ sub process {
while (my ($id, $name) = $rs->array) {
push(@tags, {
url=>$session->url->page("op=setWorkingVersionTag;backToSite=1;tagId=".$id),
title=>($id eq $working->getId) ? '<span style="color: #000080;">* '.$name.'</span>' : $name,
title=>($id eq $workingId) ? '<span style="color: #000080;">* '.$name.'</span>' : $name,
icon=>$session->config->get("extrasURL").'/spacer.gif'
});
}