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

Fixes for the class => className conversion, and addSave/editSave for new assets.

Browse source
This commit is contained in:
Colin Kuskie 2011-12-12 10:32:48 -08:00
parent d3836cd3ad
commit ba345e221b
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@ sub canEdit {
my $form = $self->session->form;
my $addNew = $form->process("func" ) eq "add";
my $editSave = $form->process("assetId" ) eq "new"
&& $form->process("func" ) eq "editSave"
&& $form->process("func" ) eq "addSave"
&& $form->process("className","className" ) eq "WebGUI::Asset::WikiPage";
return $wiki->canAdminister
|| ( $wiki->canEditPages && ( $addNew || $editSave || !$self->isProtected) );

2
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -290,7 +290,7 @@ sub _getFormFields {
my $entry = $self->entry;
my @orderedFields = map { $self->getFieldConfig($_) } @{ $self->getFieldOrder };
my $func = $session->form->process('func');
my $ignoreForm = $func eq 'editSave' || $func eq 'editFieldSave';
my $ignoreForm = $func eq 'addSave'|| $func eq 'editSave' || $func eq 'editFieldSave';
my @forms = ();
for my $field (@orderedFields) {
my $value;

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

@ -269,9 +269,9 @@ override canEdit => sub {
my $userId = shift || $self->session->user->userId;
my $form = $self->session->form;
if ( $form->get('func') eq "editSave"
if ( $form->get('func') eq "addSave"
&& $form->get('assetId') eq "new"
&& $form->get( 'class' )->isa( 'WebGUI::Asset::MatrixListing' ) ) {
&& $form->get( 'className','className' )->isa( 'WebGUI::Asset::MatrixListing' ) ) {
return $self->canAddMatrixListing();
}
return super();

2
lib/WebGUI/Asset/Wobject/WikiMaster.pm
View file

@ -453,7 +453,7 @@ around canEdit => sub {
my $form = $self->session->form;
my $addNew = $form->process("func" ) eq "add";
my $editSave = $form->process("assetId" ) eq "new"
&& $form->process("func" ) eq "editSave"
&& $form->process("func" ) eq "addSave"
&& $form->process("className","className" ) eq "WebGUI::Asset::WikiPage";
my $canEdit = ( ($addNew || $editSave) && $self->canEditPages )
|| $self->$orig(@_);