mam/mamweb
11
0
Fork 0
Code Issues Pull requests 8 Projects Wiki Activity Actions

Odebrany force_unicode

Browse source
This commit is contained in:
Martin Z. (Zimamazim) 2019-06-20 22:33:45 +02:00
parent e0c7898769
commit cb24a87baf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
galerie/models.py
View file

@ -30,7 +30,7 @@ def obrazek_filename_velky():
def obrazek_filename(self, filename):
gal = self.galerie
cislo_gal = force_unicode(gal.pk)
cislo_gal = gal.pk
# najdi kořenovou galerii
while (gal.galerie_up):
@ -39,8 +39,8 @@ def obrazek_filename(self, filename):
# soustředění je v cestě jen pokud galerie pod nějaké patří
cesta = (
['Galerie'] +
(["soustredeni_" + force_unicode(gal.soustredeni.pk)] if gal.soustredeni else []) +
["galerie_" + cislo_gal, force_unicode(self.nazev)]
(["soustredeni_" + gal.soustredeni.pk] if gal.soustredeni else []) +
["galerie_" + cislo_gal, self.nazev]
)
return os.path.join(*cesta)
@ -60,8 +60,8 @@ class Obrazek(models.Model):
galerie = models.ForeignKey('Galerie', blank=True, null=True, on_delete=models.SET_NULL)
poradi = models.IntegerField('Pořadí', blank=True, null=True)
def __unicode__(self):
return unicode(self.obrazek_velky.name)
def __str__(self):
return self.obrazek_velky.name
class Meta:
verbose_name = 'Obrázek'
@ -94,7 +94,7 @@ class Galerie(models.Model):
on_delete=models.PROTECT)
poradi = models.IntegerField('Pořadí', blank = True, null = True)
def __unicode__(self):
def __str__(self):
return self.nazev
class Meta:
verbose_name = 'Galerie'