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

fixed branch editing to be more user friendly

Browse source
This commit is contained in:
JT Smith 2005-01-30 23:03:35 +00:00
parent 0da7fcf659
commit dd8ed95a19
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/WebGUI/Asset.pm
View file

@ -768,7 +768,7 @@ sub getAssetManagerControl {
$output .= "labels['purge'] = 'Purge';\n"; $output .= "labels['purge'] = 'Purge';\n";
$output .= "labels['go'] = 'Go';\n"; $output .= "labels['go'] = 'Go';\n";
$output .= "labels['properties'] = 'Properties';\n"; $output .= "labels['properties'] = 'Properties';\n";
$output .= "labels['editTree'] = 'Edit Tree';\n"; $output .= "labels['editTree'] = 'Edit Branch';\n";
$output .= "var manager = new AssetManager(assets,columnHeadings,labels,crumbtrail);\n"; $output .= "var manager = new AssetManager(assets,columnHeadings,labels,crumbtrail);\n";
$output .= "manager.assetType='".$controlType."';\n" if (defined $controlType); $output .= "manager.assetType='".$controlType."';\n" if (defined $controlType);
$output .= "manager.disableDisplay(0);\n" if (defined $removeRank); $output .= "manager.disableDisplay(0);\n" if (defined $removeRank);
@ -1333,6 +1333,7 @@ Returns an asset hash of the parent of current Asset.
sub getParent { sub getParent {
my $self = shift; my $self = shift;
return $self if ($self->get("assetId") eq "PBasset000000000000001");
$self->{_parent} = WebGUI::Asset->newByDynamicClass($self->get("parentId")) unless (exists $self->{_parent}); $self->{_parent} = WebGUI::Asset->newByDynamicClass($self->get("parentId")) unless (exists $self->{_parent});
return $self->{_parent}; return $self->{_parent};
} }
@ -2616,7 +2617,9 @@ sub www_editTreeSave {
} }
$descendant->update(\%data); $descendant->update(\%data);
} }
return $self->www_manageAssets; delete $self->{_parent};
$session{asset} = $self->getParent;
return $self->getParent->www_manageAssets;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -2812,7 +2815,7 @@ sub www_manageAssets {
$output .= ' <div class="adminConsoleSpacer"> $output .= ' <div class="adminConsoleSpacer">
&nbsp; &nbsp;
</div> </div>
<div style="float: left; padding-right: 30px; font-size: 14px;"><b>'.WebGUI::International::get(1083).'</b><br />'; <div style="float: left; padding-right: 30px; font-size: 14px;"><fieldset><legend>'.WebGUI::International::get(1083).'</legend>';
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets",1)}) { foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets",1)}) {
$output .= '<a href="'.$link->{url}.'">'.$link->{label}.'</a><br />'; $output .= '<a href="'.$link->{url}.'">'.$link->{label}.'</a><br />';
} }
@ -2820,7 +2823,7 @@ sub www_manageAssets {
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) { foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) {
$output .= '<a href="'.$link->{url}.'">'.$link->{label}.'</a><br />'; $output .= '<a href="'.$link->{url}.'">'.$link->{label}.'</a><br />';
} }
$output .= '</div>'; $output .= '</fieldset></div>';
my %options; my %options;
tie %options, 'Tie::IxHash'; tie %options, 'Tie::IxHash';
my $hasClips = 0; my $hasClips = 0;
@ -2829,14 +2832,14 @@ sub www_manageAssets {
$hasClips = 1; $hasClips = 1;
} }
if ($hasClips) { if ($hasClips) {
$output .= '<div style="float: left; padding-right: 30px; font-size: 14px;"><b>'.WebGUI::International::get(1082).'</b><br />' $output .= '<div style="float: left; padding-right: 30px; font-size: 14px;"><fieldset><legend>'.WebGUI::International::get(1082).'</legend>'
.WebGUI::Form::formHeader() .WebGUI::Form::formHeader()
.WebGUI::Form::hidden({name=>"func",value=>"pasteList"}) .WebGUI::Form::hidden({name=>"func",value=>"pasteList"})
.WebGUI::Form::checkList({name=>"assetId",options=>\%options}) .WebGUI::Form::checkList({name=>"assetId",vertical=>1,options=>\%options})
.'<br />' .'<br />'
.WebGUI::Form::submit({value=>"Paste"}) .WebGUI::Form::submit({value=>"Paste"})
.WebGUI::Form::formFooter() .WebGUI::Form::formFooter()
.' </div> '; .' </fieldset></div> ';
} }
$output .= ' $output .= '
<div class="adminConsoleSpacer"> <div class="adminConsoleSpacer">

4
lib/WebGUI/Asset/USS_submission.pm
View file

@ -261,7 +261,7 @@ sub view {
sub www_approve { sub www_approve {
my $self = shift; my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canModerate); return WebGUI::Privilege::insufficient() unless ($self->canModerate);
$self->set({"status"=>'Approved'}); $self->update({"status"=>'Approved'});
WebGUI::MessageLog::addInternationalizedEntry($self->get("ownerUserId"),'',$self->getUrl,4,"USS"); WebGUI::MessageLog::addInternationalizedEntry($self->get("ownerUserId"),'',$self->getUrl,4,"USS");
if ($session{form}{mlog}) { if ($session{form}{mlog}) {
WebGUI::MessageLog::completeEntry($session{form}{mlog}); WebGUI::MessageLog::completeEntry($session{form}{mlog});
@ -275,7 +275,7 @@ sub www_approve {
sub www_deny { sub www_deny {
my $self = shift; my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canModerate); return WebGUI::Privilege::insufficient() unless ($self->canModerate);
$self->set({status=>'Denied'}); $self->update({status=>'Denied'});
WebGUI::MessageLog::addInternationalizedEntry($self->get("ownerUserId"),'',$self->getUrl,5,"USS"); WebGUI::MessageLog::addInternationalizedEntry($self->get("ownerUserId"),'',$self->getUrl,5,"USS");
if ($session{form}{mlog}) { if ($session{form}{mlog}) {
WebGUI::MessageLog::completeEntry($session{form}{mlog}); WebGUI::MessageLog::completeEntry($session{form}{mlog});

2
lib/WebGUI/i18n/English/Asset.pm
View file

@ -3,7 +3,7 @@ package WebGUI::i18n::English::Asset;
our $I18N = { our $I18N = {
'change' => { 'change' => {
message => q|Change?|, message => q|Change recursively?|,
lastUpdated => 1099344172, lastUpdated => 1099344172,
context => q|Used when editing an entire branch, and asks whether the user wants to change this field recursively.| context => q|Used when editing an entire branch, and asks whether the user wants to change this field recursively.|
}, },