X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/0a08ba4250b13d7804118703aa0acca6a1a1703c..dbbc27e1f646dece854dc54425a6fc5fc22e5eae:/apps/catalogue/models/image.py?ds=sidebyside diff --git a/apps/catalogue/models/image.py b/apps/catalogue/models/image.py index 797d27d5..fffa4b38 100755 --- a/apps/catalogue/models/image.py +++ b/apps/catalogue/models/image.py @@ -9,6 +9,7 @@ from django.db import models from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ from catalogue.helpers import cached_in_field +from catalogue.models import Project from catalogue.tasks import refresh_instance from dvcs import models as dvcs_models @@ -21,6 +22,7 @@ class Image(dvcs_models.Document): title = models.CharField(_('title'), max_length=255, blank=True) slug = models.SlugField(_('slug'), unique=True) public = models.BooleanField(_('public'), default=True, db_index=True) + project = models.ForeignKey(Project, null=True, blank=True) # cache _short_html = models.TextField(null=True, blank=True, editable=False) @@ -84,8 +86,16 @@ class Image(dvcs_models.Document): raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e)) valid_about = self.correct_about() - assert (picture.picture_info.about == valid_about, - _("rdf:about is not") + " " + valid_about) + assert picture.picture_info.about == valid_about, \ + _("rdf:about is not") + " " + valid_about + + def publishable_error(self): + try: + return self.assert_publishable() + except AssertionError, e: + return e + else: + return None def accessible(self, request): return self.public or request.user.is_authenticated()