Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
aceb72df
Commit
aceb72df
authored
Oct 15, 2018
by
Ryan Herbert
Committed by
Mathieu Giraud
Oct 15, 2018
Browse files
generic.py run.py use display_name for get_info_dict
See
#3533
parent
613d314b
Pipeline
#44122
passed with stages
in 6 minutes and 7 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
server/web2py/applications/vidjil/models/generic.py
View file @
aceb72df
...
...
@@ -12,7 +12,7 @@ class Generic(SampleSet):
return
filter
(
lambda
row
:
vidjil_utils
.
advanced_filter
(
row
[
'string'
],
filter_str
),
data
)
def
get_info_dict
(
self
,
data
):
return
dict
(
name
=
"set : %s"
%
self
.
get_display_name
(
data
),
return
dict
(
name
=
self
.
get_display_name
(
data
),
filename
=
"sample_set_%d"
%
data
[
'id'
],
label
=
""
,
info
=
""
...
...
server/web2py/applications/vidjil/models/run.py
View file @
aceb72df
...
...
@@ -30,7 +30,7 @@ class Run(SampleSet):
return
filter
(
lambda
row
:
vidjil_utils
.
advanced_filter
(
row
[
'string'
],
filter_str
),
data
)
def
get_info_dict
(
self
,
data
):
return
dict
(
name
=
"run : "
+
data
[
'name'
]
+
" ("
+
str
(
data
[
'run_date'
])
+
")"
,
return
dict
(
name
=
self
.
get_display_name
(
data
)
,
filename
=
"run : "
+
data
[
'name'
]
+
"_"
+
str
(
data
[
'run_date'
]),
label
=
data
[
'id_label'
]
+
" ("
+
str
(
data
[
'run_date'
])
+
")"
,
info
=
data
[
'info'
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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