Merge branch 'feature-s/3595-less_set_tokens' into 'dev'

SampleSet.py patient.py fix get_display_name uses

Closes #3622 and #3595

See merge request !353

server/web2py/applications/vidjil/models/SampleSet.py

@@ -46,7 +46,7 @@ class SampleSet(object):
     def get_config_urls(self, data):
         configs = []
         for conf in data['conf_list']:
-            filename =  "(%s %s)" % (self.get_display_name(data), conf['name'])
+            filename =  "(%s %s)" % (self.get_name(data), conf['name'])
             if conf['fused_file'] is not None :
                 configs.append(
                     str(A(conf['name'],

server/web2py/applications/vidjil/models/patient.py

@@ -32,7 +32,7 @@ class Patient(SampleSet):
     def get_info_dict(self, data):
         name = self.get_display_name(data)
         return dict(name = name,
-                    filename = name,
+                    filename = self.get_name(data),
                     label = data['id_label'] + " (" + str(data['birth']) + ")",
                     info = data['info']
                     )