Merge branch 'master' into v0.9

Conflicts:
	Makefile.example
	archaeological_operations/migrations/0061_regenerate_cached_label.py
	archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py

1 files changed, 7 insertions, 4 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index a2341abdc..35608abdf 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -102,7 +102,7 @@ class Imported(models.Model):
 class ValueGetter(object):
     _prefix = ""
     GET_VALUES_EXTRA = []
-    EXTRA_FULL_FIELDS_LABELS = {}
+    COL_LABELS = {}
 
     def get_values(self, prefix=''):
         if not prefix:
@@ -2276,6 +2276,8 @@ ENCODINGS = [(settings.ENCODING, settings.ENCODING),
 
 class Import(models.Model):
     user = models.ForeignKey('IshtarUser')
+    name = models.CharField(_(u"Name"), max_length=500,
+                            blank=True, null=True)
     importer_type = models.ForeignKey(ImporterType)
     imported_file = models.FileField(
         _(u"Imported file"), upload_to="upload/imports/", max_length=220)
@@ -2313,8 +2315,7 @@ class Import(models.Model):
         verbose_name_plural = _(u"Imports")
 
     def __unicode__(self):
-        return u"%s - %s - %d" % (unicode(self.importer_type),
-                                  unicode(self.user), self.pk)
+        return u"{} | {}".format(self.name or u"-", self.importer_type)
 
     def need_matching(self):
         return bool(TargetKey.objects.filter(associated_import=self,
@@ -2842,10 +2843,11 @@ IshtarUser._meta.get_field('password').help_text = _(
 
 
 class AuthorType(GeneralType):
+    order = models.IntegerField(_(u"Order"), default=1)
     class Meta:
         verbose_name = _(u"Author type")
         verbose_name_plural = _(u"Author types")
-        ordering = ['label']
+        ordering = ['order', 'label']
 post_save.connect(post_save_cache, sender=AuthorType)
 post_delete.connect(post_save_cache, sender=AuthorType)
 
@@ -2858,6 +2860,7 @@ class Author(models.Model):
     class Meta:
         verbose_name = _(u"Author")
         verbose_name_plural = _(u"Authors")
+        ordering = ('author_type__order', 'person__name')
 
     def __unicode__(self):
         return unicode(self.person) + settings.JOINT + \