Skip to content
Merged

Develop #1018

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: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.swo
.swp
dockerfiles
t
*.md
dockerfiles/*
t/*
.git/*
.gitmodules/*
1 change: 1 addition & 0 deletions Dockerfile
3 changes: 3 additions & 0 deletions src/MGRAST/bin/resubmit_annotation_to_awe.pl
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env perl

use lib "/MG-RAST/conf";
use lib "/MG-RAST/site/lib/MGRAST";

use strict;
use warnings;
no warnings('once');
Expand Down
3 changes: 3 additions & 0 deletions src/MGRAST/bin/resubmit_to_awe.pl
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env perl

use lib "/MG-RAST/conf";
use lib "/MG-RAST/site/lib/MGRAST";

use strict;
use warnings;
no warnings('once');
Expand Down
3 changes: 3 additions & 0 deletions src/MGRAST/bin/submit_to_awe.pl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
# 2. create job script based on job template and available info
# 3. submit the job json script to awe

use lib "/MG-RAST/conf";
use lib "/MG-RAST/site/lib/MGRAST";

use strict;
use warnings;
no warnings('once');
Expand Down
2 changes: 1 addition & 1 deletion src/MGRAST/lib/resources/job.pm
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ sub job_action {
# share rights if not owner
unless ($share_user->_id eq $job->owner->_id) {
my @rights = ('view');
my @acls = ('read')
my @acls = ('read');
if ($post->{edit}) {
push @rights, 'edit';
push @acls, 'write';
Expand Down