CONT: fixed the previous changes.

dav_events/models/eventstatus.py

@@ -1,5 +1,4 @@
 from django.db import models
-from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 
 from ..validators import IdStringValidator
@@ -26,18 +25,10 @@ class EventStatus(models.Model):
         ordering = ['severity']
 
     def __unicode__(self):
-        return u'{label} ({severity} - {code})'.format(code=self.code,
+        return u'{severity} - {code} ({label})'.format(code=self.code,
                                                        severity=self.severity,
                                                        label=self.label)
 
-    def get_bootstrap_label(self):
-        context = self.bootstrap_context or 'default'
-        return format_html(u'<span class="label label-{context}">{label}</span>',
-                           context=context,
-                           label=self.label)
-        #return u'<span class="label label-{context}">{label}</span>'.format(context=context,
-        #                                                                    label=self.label)
-
 
 def get_or_create_event_status(code):
     try: