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

fix for editing interfaces to Assets that still display an edit button even if the Asset is edit locked.

Browse source
This commit is contained in:
Colin Kuskie 2007-04-29 03:16:13 +00:00
parent 38060cc0cb
commit 8b7bafe1ae
19 changed files with 59 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog/7.x.x.txt
View file

@ -2,7 +2,8 @@
- fix: The POD of Form::Image is faulty (perlDreamer Consulting, LLC) - fix: The POD of Form::Image is faulty (perlDreamer Consulting, LLC)
- fix: Method name clash between WebGUI::Asset::Post::Thread and WebGUI::AssetVersioning (perlDreamer Consulting, LLC) - fix: Method name clash between WebGUI::Asset::Post::Thread and WebGUI::AssetVersioning (perlDreamer Consulting, LLC)
- fix: Images in various places were broken in 7.3.15 - fix: Images in various places were broken in 7.3.15
- fix: Able to edit locked template (perlDreamer Consulting, LLC)
http://www.plainblack.com/bugs/tracker/able-to-edit-locked-template
7.3.15 7.3.15

2
lib/WebGUI/Asset.pm
View file

@ -2065,6 +2065,7 @@ Renders an AdminConsole EditForm, unless canEdit returns False.
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
return $self->getAdminConsole->render($self->getEditForm->print); return $self->getAdminConsole->render($self->getEditForm->print);
} }
@ -2080,6 +2081,7 @@ NOTE: Don't try to override or overload this method. It won't work. What you are
sub www_editSave { sub www_editSave {
my $self = shift; my $self = shift;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
if ($self->session->config("maximumAssets")) { if ($self->session->config("maximumAssets")) {
my ($count) = $self->session->db->quickArray("select count(*) from asset"); my ($count) = $self->session->db->quickArray("select count(*) from asset");

1
lib/WebGUI/Asset/File.pm
View file

@ -372,6 +372,7 @@ sub view {
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $i18n = WebGUI::International->new($self->session); my $i18n = WebGUI::International->new($self->session);
my $tabform = $self->getEditForm; my $tabform = $self->getEditForm;
$tabform->getTab("display")->template( $tabform->getTab("display")->template(

10
lib/WebGUI/Asset/File/Image.pm
View file

@ -264,8 +264,9 @@ sub view {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $i18n = WebGUI::International->new($self->session, 'Asset_Image'); my $i18n = WebGUI::International->new($self->session, 'Asset_Image');
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=resize'),$i18n->get("resize image")) if ($self->get("filename")); $self->getAdminConsole->addSubmenuItem($self->getUrl('func=resize'),$i18n->get("resize image")) if ($self->get("filename"));
my $tabform = $self->getEditForm; my $tabform = $self->getEditForm;
@ -281,8 +282,9 @@ sub www_edit {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_resize { sub www_resize {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
if ($self->session->form->process("newWidth") || $self->session->form->process("newHeight")) { if ($self->session->form->process("newWidth") || $self->session->form->process("newHeight")) {
my $newSelf = $self->addRevision(); my $newSelf = $self->addRevision();
delete $newSelf->{_storageLocation}; delete $newSelf->{_storageLocation};

12
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -239,12 +239,12 @@ Web facing method which is the default edit page
=cut =cut
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("zip archive add/edit", "Asset_ZipArchive"); return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $i18n = WebGUI::International->new($self->session,"Asset_ZipArchive"); $self->getAdminConsole->setHelp("zip archive add/edit", "Asset_ZipArchive");
return $self->getAdminConsole->render($self->getEditForm->print, my $i18n = WebGUI::International->new($self->session,"Asset_ZipArchive");
$i18n->get('zip archive add/edit title')); return $self->getAdminConsole->render($self->getEditForm->print, $i18n->get('zip archive add/edit title'));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

1
lib/WebGUI/Asset/Post.pm
View file

@ -1249,6 +1249,7 @@ We're extending www_editSave() here to deal with editing a post that has been de
sub www_editSave { sub www_editSave {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
if ($self->session->config("maximumAssets")) { if ($self->session->config("maximumAssets")) {
my ($count) = $self->session->db->quickArray("select count(*) from asset"); my ($count) = $self->session->db->quickArray("select count(*) from asset");
my $i18n = WebGUI::International->new($self->session, "Asset"); my $i18n = WebGUI::International->new($self->session, "Asset");

9
lib/WebGUI/Asset/Redirect.pm
View file

@ -82,11 +82,12 @@ sub definition {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("redirect add/edit", "Asset_Redirect"); return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("redirect add/edit", "Asset_Redirect");
my $i18n = WebGUI::International->new($self->session, 'Asset_Redirect'); my $i18n = WebGUI::International->new($self->session, 'Asset_Redirect');
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('redirect add/edit title')); return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('redirect add/edit title'));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

7
lib/WebGUI/Asset/RichEdit.pm
View file

@ -555,10 +555,11 @@ sub indexContent {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $i18n = WebGUI::International->new($self->session,"Asset_RichEdit"); my $i18n = WebGUI::International->new($self->session,"Asset_RichEdit");
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get("rich edit edit config")); return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get("rich edit edit config"));
} }

1
lib/WebGUI/Asset/Shortcut.pm
View file

@ -680,6 +680,7 @@ sub view {
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("shortcut add/edit","Asset_Shortcut"); $self->getAdminConsole->setHelp("shortcut add/edit","Asset_Shortcut");
my $i18n = WebGUI::International->new($self->session,"Asset_Shortcut"); my $i18n = WebGUI::International->new($self->session,"Asset_Shortcut");
$self->getAdminConsole->addSubmenuItem($self->getUrl("func=manageOverrides"),$i18n->get("Manage Shortcut Overrides")); $self->getAdminConsole->addSubmenuItem($self->getUrl("func=manageOverrides"),$i18n->get("Manage Shortcut Overrides"));

11
lib/WebGUI/Asset/Snippet.pm
View file

@ -174,11 +174,12 @@ sub view {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("snippet add/edit","Asset_Snippet"); return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $i18n = WebGUI::International->new($self->session, 'Asset_Snippet'); $self->getAdminConsole->setHelp("snippet add/edit","Asset_Snippet");
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('snippet add/edit title')); my $i18n = WebGUI::International->new($self->session, 'Asset_Snippet');
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('snippet add/edit title'));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

16
lib/WebGUI/Asset/Template.pm
View file

@ -351,12 +351,13 @@ sub processRaw {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
my $i18n = WebGUI::International->new($self->session, "Asset_Template"); return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("template add/edit","Asset_Template"); my $i18n = WebGUI::International->new($self->session, "Asset_Template");
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=styleWizard'),$i18n->get("style wizard")) if ($self->get("namespace") eq "style"); $self->getAdminConsole->setHelp("template add/edit","Asset_Template");
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('edit template')); $self->getAdminConsole->addSubmenuItem($self->getUrl('func=styleWizard'),$i18n->get("style wizard")) if ($self->get("namespace") eq "style");
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('edit template'));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -378,7 +379,8 @@ sub www_manage {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_styleWizard { sub www_styleWizard {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $i18n = WebGUI::International->new($self->session, "Asset_Template"); my $i18n = WebGUI::International->new($self->session, "Asset_Template");
my $form = $self->session->form; my $form = $self->session->form;
my $output = ""; my $output = "";

1
lib/WebGUI/Asset/WikiPage.pm
View file

@ -333,6 +333,7 @@ sub www_delete {
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient unless $self->canEdit; return $self->session->privilege->insufficient unless $self->canEdit;
return $self->session->privilege->locked unless $self->canEditIfLocked;
return $self->getWiki->processStyle($self->getEditForm); return $self->getWiki->processStyle($self->getEditForm);
} }

1
lib/WebGUI/Asset/Wobject.pm
View file

@ -485,6 +485,7 @@ Returns an edit form for this asset.
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my ($tag) = ($self->get("className") =~ /::(\w+)$/); my ($tag) = ($self->get("className") =~ /::(\w+)$/);
my $tag2 = $tag; my $tag2 = $tag;
$tag =~ s/([a-z])([A-Z])/$1 $2/g; #Separate studly caps $tag =~ s/([a-z])([A-Z])/$1 $2/g; #Separate studly caps

1
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -1426,6 +1426,7 @@ sub www_edit {
my $i18n = WebGUI::International->new($session, 'Asset_Calendar'); my $i18n = WebGUI::International->new($session, 'Asset_Calendar');
return $session->privilege->insufficient() unless $self->canEdit; return $session->privilege->insufficient() unless $self->canEdit;
return $session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("Calendar add/edit", "Calendar"); $self->getAdminConsole->setHelp("Calendar add/edit", "Calendar");

1
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -1606,6 +1606,7 @@ Edit wobject method.
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my ($tag) = ($self->get("className") =~ /::(\w+)$/); my ($tag) = ($self->get("className") =~ /::(\w+)$/);
my $tag2 = $tag; my $tag2 = $tag;
$tag =~ s/([a-z])([A-Z])/$1 $2/g; #Separate studly caps $tag =~ s/([a-z])([A-Z])/$1 $2/g; #Separate studly caps

9
lib/WebGUI/Asset/Wobject/InOutBoard.pm
View file

@ -296,11 +296,12 @@ order by department, lastName, firstName";
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("in out board add/edit","Asset_InOutBoard"); return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("in out board add/edit","Asset_InOutBoard");
my $i18n = WebGUI::International->new($self->session, "Asset_InOutBoard"); my $i18n = WebGUI::International->new($self->session, "Asset_InOutBoard");
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get("18")); return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get("18"));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

8
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -508,12 +508,12 @@ sub getEditForm {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $i18n = WebGUI::International->new($self->session,'Asset_Matrix'); my $i18n = WebGUI::International->new($self->session,'Asset_Matrix');
$self->getAdminConsole->setHelp('matrix add/edit', 'Asset_Matrix'); $self->getAdminConsole->setHelp('matrix add/edit', 'Asset_Matrix');
return $self->getAdminConsole->render($self->getEditForm->print, return $self->getAdminConsole->render($self->getEditForm->print, $i18n->get("edit matrix"));
$i18n->get("edit matrix"));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

1
lib/WebGUI/Asset/Wobject/_NewWobject.skeleton
View file

@ -181,6 +181,7 @@ adminConsole views.
#sub www_edit { #sub www_edit {
# my $self = shift; # my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit; # return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return WebGUI::Privilege::locked() unless $self->canEditIfLocked;
# $self->getAdminConsole->setHelp("new wobject add/edit", "NewWobject"); # $self->getAdminConsole->setHelp("new wobject add/edit", "NewWobject");
# return $self->getAdminConsole->render($self->getEditForm->print, # return $self->getAdminConsole->render($self->getEditForm->print,
# WebGUI::International::get("edit_title","NewWobject")); # WebGUI::International::get("edit_title","NewWobject"));

3
lib/WebGUI/Asset/_NewAsset.skeleton
View file

@ -238,7 +238,8 @@ Web facing method which is the default edit page
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("New Asset add/edit", "New Asset"); $self->getAdminConsole->setHelp("New Asset add/edit", "New Asset");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('edit asset',"Asset_NewAsset")); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('edit asset',"Asset_NewAsset"));
} }