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

a bunch of bug fixes and ease of use modifications for workflow/versioning

Browse source
This commit is contained in:
JT Smith 2006-03-20 21:07:26 +00:00
parent 00a1db29a1
commit 3931d8dcd2
8 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -280,7 +280,7 @@ sub www_manageVersions {
$ac->setHelp("versions manage");
$ac->addSubmenuItem($session->url->page('op=editVersionTag'), $i18n->get("add a version tag"));
$ac->addSubmenuItem($session->url->page('op=manageCommittedVersions'), $i18n->get("manage committed versions")) if ($session->user->isInGroup(3));
my ($tag) = $session->db->quickArray("select name from assetVersionTag where tagId=?",[$session->scratch->get("versionTag")]);
my ($tag,$workingTagId) = $session->db->quickArray("select name,tagId from assetVersionTag where tagId=?",[$session->scratch->get("versionTag")]);
$tag ||= "None";
my $rollback = $i18n->get("rollback");
my $commit = $i18n->get("commit");
@ -301,8 +301,11 @@ sub www_manageVersions {
<td><a href="'.$session->url->page("op=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
<td>'.$session->datetime->epochToHuman($date).'</td>
<td>'.$u->username.'</td>
<td>
<a href="'.$session->url->page("op=setWorkingVersionTag;tagId=".$id).'">'.$setTag.'</a> |
<td>';
unless ($workingTagId eq $id) {
$output .= '<a href="'.$session->url->page("op=setWorkingVersionTag;tagId=".$id).'">'.$setTag.'</a> | ';
}
$output .='
<a href="'.$session->url->page("op=commitVersionTag;tagId=".$id).'" onclick="return confirm(\''.$commitPrompt.'\');">'.$commit.'</a></td></tr>';
}
$sth->finish;
@ -381,7 +384,7 @@ sub www_manageRevisionsInTag {
my $asset = WebGUI::Asset->new($session,$id,$class,$date);
$output .= '<tr><td>'
.$session->icon->delete("func=purgeRevision;proceed=manageRevisionsInTag;tagId=".$tag->getId.";revisionDate=".$date,$asset->get("url"),$i18n->get("purge revision prompt"))
.$session->icon->view("func=viewRevision;revisionDate=".$date)
.$session->icon->view("func=viewRevision;revisionDate=".$date, $asset->get("url"))
.'</td>
<td>'.$asset->getTitle.'</td>
<td><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" />'.$asset->getName.'</td>

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

@ -158,7 +158,7 @@ sub www_editWorkflow {
label=>$i18n->get("title"),
hoverHelp=>$i18n->get("title help")
);
$f->text(
$f->textarea(
name=>"description",
value=>$workflow->get("description"),
label=>$i18n->get("description"),