diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index c6a905d8d..6f77e6a5a 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -768,7 +768,7 @@ sub getAssetManagerControl { $output .= "labels['purge'] = 'Purge';\n"; $output .= "labels['go'] = 'Go';\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 .= "manager.assetType='".$controlType."';\n" if (defined $controlType); $output .= "manager.disableDisplay(0);\n" if (defined $removeRank); @@ -1333,6 +1333,7 @@ Returns an asset hash of the parent of current Asset. sub getParent { my $self = shift; + return $self if ($self->get("assetId") eq "PBasset000000000000001"); $self->{_parent} = WebGUI::Asset->newByDynamicClass($self->get("parentId")) unless (exists $self->{_parent}); return $self->{_parent}; } @@ -2616,7 +2617,9 @@ sub www_editTreeSave { } $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 .= '
 
-
'.WebGUI::International::get(1083).'
'; +
'.WebGUI::International::get(1083).''; foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets",1)}) { $output .= ''.$link->{label}.'
'; } @@ -2820,7 +2823,7 @@ sub www_manageAssets { foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) { $output .= ''.$link->{label}.'
'; } - $output .= '
'; + $output .= '
'; my %options; tie %options, 'Tie::IxHash'; my $hasClips = 0; @@ -2829,14 +2832,14 @@ sub www_manageAssets { $hasClips = 1; } if ($hasClips) { - $output .= '
'.WebGUI::International::get(1082).'
' + $output .= '
'.WebGUI::International::get(1082).'' .WebGUI::Form::formHeader() .WebGUI::Form::hidden({name=>"func",value=>"pasteList"}) - .WebGUI::Form::checkList({name=>"assetId",options=>\%options}) + .WebGUI::Form::checkList({name=>"assetId",vertical=>1,options=>\%options}) .'
' .WebGUI::Form::submit({value=>"Paste"}) .WebGUI::Form::formFooter() - .'
'; + .'
'; } $output .= '
diff --git a/lib/WebGUI/Asset/USS_submission.pm b/lib/WebGUI/Asset/USS_submission.pm index 400b969db..fc15c97b3 100644 --- a/lib/WebGUI/Asset/USS_submission.pm +++ b/lib/WebGUI/Asset/USS_submission.pm @@ -261,7 +261,7 @@ sub view { sub www_approve { my $self = shift; 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"); if ($session{form}{mlog}) { WebGUI::MessageLog::completeEntry($session{form}{mlog}); @@ -275,7 +275,7 @@ sub www_approve { sub www_deny { my $self = shift; 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"); if ($session{form}{mlog}) { WebGUI::MessageLog::completeEntry($session{form}{mlog}); diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index 22f036416..693c160db 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -3,7 +3,7 @@ package WebGUI::i18n::English::Asset; our $I18N = { 'change' => { - message => q|Change?|, + message => q|Change recursively?|, lastUpdated => 1099344172, context => q|Used when editing an entire branch, and asks whether the user wants to change this field recursively.| },