Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
vidjil
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1,696
Issues
1,696
List
Boards
Labels
Service Desk
Milestones
Merge Requests
90
Merge Requests
90
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vidjil
vidjil
Commits
8694c08c
Commit
8694c08c
authored
Jul 13, 2018
by
Mikaël Salson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-s/minor_file_optimisation' into 'dev'
file.py form() remove a query See merge request
!239
parents
e9f4b135
c5268afd
Pipeline
#33085
passed with stages
in 57 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
server/web2py/applications/vidjil/controllers/file.py
server/web2py/applications/vidjil/controllers/file.py
+2
-2
No files found.
server/web2py/applications/vidjil/controllers/file.py
View file @
8694c08c
...
...
@@ -168,9 +168,9 @@ def form():
&
(
db
.
sample_set_membership
.
sample_set_id
!=
None
)
&
(
db
.
sample_set
.
id
==
db
.
sample_set_membership
.
sample_set_id
)
&
(
db
.
sample_set
.
sample_type
!=
'sequence_file'
)
).
select
(
db
.
sample_set_membership
.
sample_set_id
)
).
select
(
db
.
sample_set_membership
.
sample_set_id
.
with_alias
(
'sample_set_id'
),
db
.
sample_set
.
sample_type
.
with_alias
(
'sample_type'
)
)
for
row
in
sample_set_list
:
smp_type
=
db
.
sample_set
[
row
.
sample_set_id
]
.
sample_type
smp_type
=
row
.
sample_type
if
smp_type
not
in
relevant_ids
:
relevant_ids
[
smp_type
]
=
[]
relevant_ids
[
smp_type
].
append
(
db
(
db
[
smp_type
].
sample_set_id
==
row
.
sample_set_id
).
select
()[
0
].
id
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment