fix upload_js

[redakcja.git] / apps / organizations / models.py

diff --git a/apps/organizations/models.py b/apps/organizations/models.py
index 1781d7d..0919f76 100644 (file)
--- a/apps/organizations/models.py
+++ b/apps/organizations/models.py
@@ -1,12 +1,10 @@
+# -*- coding: utf-8 -*-

 from __future__ import unicode_literals
 
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from __future__ import unicode_literals
 
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible

-from django.template.loader import render_to_string
-from django.utils import translation 
-#from jsonfield import JSONField

 
 
 countries = [
 
 
 countries = [


@@ -49,50 +47,26 @@ class Card(models.Model):
     description = models.TextField(blank=True, default="")
     projects = models.TextField(blank=True, default="")
 
     description = models.TextField(blank=True, default="")
     projects = models.TextField(blank=True, default="")
 

-    preview_html = models.TextField(blank=True, default="")
-    preview_html_pl = models.TextField(blank=True, default="")
-

     created_at = models.DateTimeField(auto_now_add=True)
 
     class Meta:
         abstract = True
 
     created_at = models.DateTimeField(auto_now_add=True)
 
     class Meta:
         abstract = True
 

-    def save(self, *args, **kwargs):
-        translation.activate('en')
-        self.preview_html = render_to_string(self.preview_html_template, {
-            'org': self
-        })
-        translation.activate('pl')
-        self.preview_html_pl = render_to_string(self.preview_html_template, {
-            'org': self
-        })
-        ret = super(Card, self).save(*args, **kwargs)
-        return ret
-

     def get_projects(self):
         for project_line in self.projects.strip().split('\n'):
     def get_projects(self):
         for project_line in self.projects.strip().split('\n'):

-            parts = project_line.strip().split(' ', 2)
+            parts = project_line.strip().split(None, 2)

             if not parts or not parts[0]:
                 continue
             url, lang, desc = (parts + [''] * 2)[:3]
             yield url, lang, desc
 
             if not parts or not parts[0]:
                 continue
             url, lang, desc = (parts + [''] * 2)[:3]
             yield url, lang, desc
 

-    def get_preview_html(self):
-        lang = translation.get_language()
-        try:
-            p = getattr(self, "preview_html_%s" % lang)
-            assert p
-            return p
-        except:
-            return self.preview_html

 
 @python_2_unicode_compatible
 class UserCard(Card):
 
 @python_2_unicode_compatible
 class UserCard(Card):

-    preview_html_template = 'organizations/snippets/user.html'
-    user = models.ForeignKey(User, unique=True, primary_key=True)
+    user = models.OneToOneField(User, primary_key=True)

 
     def __str__(self):
 
     def __str__(self):

-        return str(self.user)
+        return self.user.get_full_name()

 
     def get_absolute_url(self):
         return reverse('organizations_user', args=[self.user.pk])
 
     def get_absolute_url(self):
         return reverse('organizations_user', args=[self.user.pk])


@@ -100,19 +74,8 @@ class UserCard(Card):
 
 @python_2_unicode_compatible
 class Organization(Card):
 
 @python_2_unicode_compatible
 class Organization(Card):

-    preview_html_template = 'organizations/snippets/organization.html'
-

     name = models.CharField(max_length=1024)
     name = models.CharField(max_length=1024)

-    #logo = models.ImageField(upload_to='people/logo', blank=True)
-    #country = models.CharField(max_length=64, blank=True, choices=countries)
-    #www = models.URLField(blank=True)
-    #description = models.TextField(blank=True, default="")
-    ##projects = JSONField(default=[])
-    #projects = models.TextField(blank=True, default="")
-
-    #preview_html = models.TextField(blank=True, default="")
-
-    #created_at = models.DateTimeField(auto_now_add=True)
+    tags = models.ManyToManyField('catalogue.Tag', blank=True)

 
     def __str__(self):
         return self.name
 
     def __str__(self):
         return self.name