generic.py run.py use display_name for get_info_dict

See #3533

generic.py run.py use display_name for get_info_dict
See #3533
aceb72df · Ryan Herbert · Mathieu Giraud · 613d314b · aceb72df · aceb72df
Commit aceb72df authored Oct 15, 2018 by Ryan Herbert Committed by Mathieu Giraud Oct 15, 2018
Showing with 2 additions and 2 deletions

server/web2py/applications/vidjil/models/generic.py server/web2py/applications/vidjil/models/generic.py +1 -1

server/web2py/applications/vidjil/models/run.py server/web2py/applications/vidjil/models/run.py +1 -1

No files found.
--- a/server/web2py/applications/vidjil/models/generic.py
+++ b/server/web2py/applications/vidjil/models/generic.py
@@ -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 = ""

--- a/server/web2py/applications/vidjil/models/run.py
+++ b/server/web2py/applications/vidjil/models/run.py
@@ -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']