Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/WebGUI/Middleware/WGAccess.pm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ sub call {
else {
$privs = JSON->new->utf8->decode($contents);
}
# in some cases there is nothing but state; default each list to an empty array
$privs->{user} ||= [ ];
$privs->{groups} ||= [ ];
$privs->{assets} ||= [ ];

return @$r = (403, [ 'Content-Type' => 'text/plain' ], [ 'Forbidden' ])
if $privs->{state} eq 'trash';
Expand Down
2 changes: 1 addition & 1 deletion lib/WebGUI/Operation/Settings.pm
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ sub www_editSettings {

# Get fieldsets for avaiable auth methods
foreach my $authName (@{$session->config->get("authMethods")}) {
my $authInstance = WebGUI::Operation::Auth::getInstance($session,$_,1);
my $authInstance = WebGUI::Operation::Auth::getInstance($session,$authName,1);
$tabform->getTab( "auth" )->addFieldset( $authInstance->editUserSettingsForm, name => $authName, label => $authName );
}

Expand Down
2 changes: 1 addition & 1 deletion t/Asset/EMSSubmissionForm.t
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ $sub1 = $sub1->cloneFromDb;
diag $sub1->submissionStatus;
diag $sub1->ticketId;
diag $sub1->getRevisionCount;
is( $sub1->get('submissionStatus'),'created','approval successfull');
is( $sub1->get('submissionStatus'),'approved','approval successfull');

my $ticket = eval { WebGUI::Asset->newById($session, $sub1->get('ticketId')); };
my $e = Exception::Class->caught();
Expand Down
2 changes: 1 addition & 1 deletion t/Asset/Wobject/Survey.t
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ my $session = WebGUI::Test->session;

#----------------------------------------------------------------------------
# Tests
plan tests => 53;
plan tests => 57;

#----------------------------------------------------------------------------
# put your tests here
Expand Down
2 changes: 0 additions & 2 deletions t/Group/ldap_groups.t
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ use lib "$FindBin::Bin/../lib";

use WebGUI::Test;
use WebGUI::Session;
use WebGUI::Utility;

use WebGUI::User;
use WebGUI::Group;
use WebGUI::Cache;

use Test::More skip_all => 'Disabled until the test LDAP server is rejuvenated';
use Test::Deep;
Expand Down