diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index b688112cd..978caf085 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -16,6 +16,7 @@ - fixed: In the Asset Manager, if you pasted an package or prototype if returned you to the page instead the manager. - fixed #10551: paypal (link to section of paypal website to enter in WebGUI information) - fixed #10550: shipping plugins have no privileges + - fixed: Add progress bars for paste and edit branch. 7.7.10 - Made a change to LDAP auth that adds an OR to that query so that it also searches for a row with fieldData REGEXP '^uid=(value-from-ldap-directory-server),'. (Wes Morgan) diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm index a8be30c8d..d4ebfef10 100644 --- a/lib/WebGUI/AssetBranch.pm +++ b/lib/WebGUI/AssetBranch.pm @@ -237,30 +237,6 @@ sub www_editBranch { return $ac->render($tabform->print, $i18n->get('edit branch','Asset')); } -#------------------------------------------------------------------- - -=head2 www_editBranchSave ( ) - -Verifies proper inputs in the Asset Tree and saves them. Returns ManageAssets method. If canEdit returns False, returns an insufficient privilege page. - -=cut - -sub www_editBranchSave { - my $self = shift; - my $session = $self->session; - return $session->privilege->insufficient() unless ($self->canEdit && $session->user->isInGroup('4')); - my $pb = WebGUI::ProgressBar->new($session); - ##Need to set the URL that should be displayed when it is done - my $i18n = WebGUI::International->new($session, 'Asset'); - $pb->setIcon($session->url->extras('adminConsole/assets.gif')); - $session->log->warn($session->request->args()); - return $pb->render({ - title => $i18n->get('Paste Assets'), - statusUrl => $self->getUrl('func=editBranchSaveStatus'), - }); -} - - #------------------------------------------------------------------- =head2 www_editBranchSaveStatus ( ) @@ -272,9 +248,11 @@ Verifies proper inputs in the Asset Tree and saves them. Returns ManageAssets me sub www_editBranchSave { my $self = shift; my $session = $self->session; -return $session->privilege->insufficient() unless ($self->canEdit && $session->user->isInGroup('4')); + return $session->privilege->insufficient() unless ($self->canEdit && $session->user->isInGroup('4')); my $form = $session->form; my %data; + my $pb = WebGUI::ProgressBar->new($session); + my $i18n = WebGUI::International->new($session, 'Asset'); $data{isHidden} = $form->yesNo("isHidden") if ($form->yesNo("change_isHidden")); $data{newWindow} = $form->yesNo("newWindow") if ($form->yesNo("change_newWindow")); $data{encryptPage} = $form->yesNo("encryptPage") if ($form->yesNo("change_encryptPage")); @@ -299,9 +277,14 @@ return $session->privilege->insufficient() unless ($self->canEdit && $session->u $urlBase = $form->text("baseUrl"); $endOfUrl = $form->selectBox("endOfUrl"); } + $pb->start($i18n->get('edit branch'), $session->url->extras('adminConsole/assets.gif')); my $descendants = $self->getLineage(["self","descendants"],{returnObjects=>1}); DESCENDANT: foreach my $descendant (@{$descendants}) { - next DESCENDANT unless $descendant->canEdit; + if ( !$descendant->canEdit ) { + $pb->update(sprintf $i18n->get('skipping %s'), $descendant->getTitle); + next DESCENDANT; + } + $pb->update(sprintf $i18n->get('editing %s'), $descendant->getTitle); my $url; if ($changeUrl) { if ($urlBaseBy eq "parentUrl") { diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index 289ae95b7..8444a98ef 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -295,8 +295,8 @@ our $I18N = { context => q|To skip, to move over, to not process| }, - 'Editing %s' => { - message => q|Editing %s|, + 'editing %s' => { + message => q|editing %s|, lastUpdated => 1245343280, context => q|To edit or change| },