Added __unicode__ method on all required models

waves/wcore/__init__.py

@@ -2,7 +2,7 @@
 WAVES django components library
 """
 __version_detail__ = '1.1.8'
-__version__ = '1.1.8'
+__version__ = '1.1.8.2'
 __author__ = 'Marc Chakiachvili, MAB Team'
 __licence__ = 'GPLv3'
 __copyright__ = "Copyright(C) 2015-2017, LIRMM - UM - CNRS"

waves/wcore/adaptors/__init__.py

@@ -30,6 +30,9 @@ class JobAdaptor(object):
     def __str__(self):
         return self.__class__.__name__
 
+    def __unicode__(self):
+        return self.__class__.__name__
+
     def __init__(self, command='', protocol='', host="localhost", **kwargs):
         """ Initialize a adaptor
         Set _initialized value (True or False) if all non default expected params are set

waves/wcore/adaptors/importer.py

@@ -60,6 +60,9 @@ def __init__(self, adaptor):
     def __str__(self):
         return self.__class__.__name__
 
+    def __unicode__(self):
+        return self.__class__.__name__
+
     @property
     def connected(self):
         return self.adaptor.connected

waves/wcore/models/adaptors.py

@@ -42,6 +42,11 @@ def __str__(self):
             return "{}|********|{}".format(self.name, self.prevent_override)
         return "{}|{}|{}".format(self.name, self.value, self.prevent_override)
 
+    def __unicode__(self):
+        if self.crypt:
+            return "{}|********|{}".format(self.name, self.prevent_override)
+        return "{}|{}|{}".format(self.name, self.value, self.prevent_override)
+
     def __init__(self, *args, **kwargs):
         super(AdaptorInitParam, self).__init__(*args, **kwargs)
         self._value = None

waves/wcore/models/binaries.py

@@ -16,3 +16,6 @@ class Meta:
 
     def __str__(self):
         return self.label
+
+    def __unicode__(self):
+        return self.label

waves/wcore/models/history.py

@@ -59,6 +59,9 @@ class Meta:
     def __str__(self):
         return '{}:{}:{}'.format(self.status, self.job, self.message) + ('(admin)' if self.is_admin else '')
 
+    def __unicode__(self):
+        return '{}:{}:{}'.format(self.status, self.job, self.message) + ('(admin)' if self.is_admin else '')
+
 
 class JobAdminHistory(JobHistory):
     """A Job Event intended only for Admin use

waves/wcore/models/inputs.py

@@ -36,6 +36,9 @@ class RepeatedGroup(Ordered):
     def __str__(self):
         return '[{}]'.format(self.name)
 
+    def __unicode__(self):
+        return '[{}]'.format(self.name)
+
 
 class AParam(PolymorphicModel, ApiModel, Ordered):
     class Meta:
@@ -128,6 +131,9 @@ def clean(self):
     def __str__(self):
         return self.label + ' (' + self.__class__.__name__ + ')'
 
+    def __unicode__(self):
+        return self.label + ' (' + self.__class__.__name__ + ')'
+
     @property
     def mandatory(self):
         return self.required is True
@@ -451,6 +457,9 @@ class Meta:
     def __str__(self):
         return '{} ({})'.format(self.label, self.name)
 
+    def __unicode__(self):
+        return '{} ({})'.format(self.label, self.name)
+
     def save_base(self, *args, **kwargs):
         super(FileInputSample, self).save_base(*args, **kwargs)
 
@@ -502,3 +511,6 @@ class Meta:
 
     def __str__(self):
         return "{} > {}={}".format(self.sample.label, self.related_to.name, self.set_default)
+
+    def __unicode__(self):
+        return "{} > {}={}".format(self.sample.label, self.related_to.name, self.set_default)

waves/wcore/models/jobs.py

@@ -435,6 +435,9 @@ def adaptor(self, value):
     def __str__(self):
         return '[{}][{}]'.format(self.slug, self.service)
 
+    def __unicode__(self):
+        return '[{}][{}]'.format(self.slug, self.service)
+
     @property
     def command(self):
         """ Return current related service command effective class
@@ -868,6 +871,9 @@ def save(self, *args, **kwargs):
     def __str__(self):
         return u'%s' % self.name
 
+    def __unicode__(self):
+        return u'%s' % self.name
+
     @property
     def file_path(self):
         """Absolute file path to associated file (if any)
@@ -1058,6 +1064,9 @@ def natural_key(self):
     def __str__(self):
         return '%s - %s' % (self.name, self.value)
 
+    def __unicode__(self):
+        return '%s - %s' % (self.name, self.value)
+
     @property
     def file_name(self):
         base = self.value + self.extension

waves/wcore/models/runners.py

@@ -51,6 +51,9 @@ def importer(self):
     def __str__(self):
         return self.name
 
+    def __unicode__(self):
+        return self.name
+
     @property
     def serializer(self, context=None):
         """ Retrieve a serializer for json export """

waves/wcore/models/services.py

@@ -152,6 +152,12 @@ def __str__(self):
         """
         return "{} v({})".format(self.name, self.version)
 
+    def __unicode__(self):
+        """ String representation
+        :return: str
+        """
+        return "{} v({})".format(self.name, self.version)
+
     def set_defaults(self):
         super(BaseService, self).set_defaults()
         for sub in self.submissions.all():
@@ -318,6 +324,9 @@ def run_params(self):
     def __str__(self):
         return '{}'.format(self.name)
 
+    def __unicode__(self):
+        return '{}'.format(self.name)
+
     @property
     def expected_inputs(self):
         """ Retrieve only expected inputs to submit a job """
@@ -450,6 +459,10 @@ def __str__(self):
         """ String representation, return label """
         return "[{}] {}".format(self.label, self.name)
 
+    def __unicode__(self):
+        """ String representation, return label """
+        return "[{}] {}".format(self.label, self.name)
+
     def clean(self):
         """ Check validity before saving """
         cleaned_data = super(SubmissionOutput, self).clean()
@@ -499,6 +512,9 @@ class Meta:
     def __str__(self):
         return '{}:{}...'.format(self.exit_code, self.message[0:20])
 
+    def __unicode__(self):
+        return '{}:{}...'.format(self.exit_code, self.message[0:20])
+
 
 class SubmissionRunParam(AdaptorInitParam):
     """ Defined runner param for Service model objects """