summaryrefslogtreecommitdiff
path: root/sublab_project
diff options
context:
space:
mode:
authorMarkus Zapke-Grùˆndemann <info@keimlink.de>2011-12-30 01:12:46 +0100
committerMarkus Zapke-Grùˆndemann <info@keimlink.de>2011-12-30 01:12:46 +0100
commitf63274bb0c00eda68b6e2fae564c4da8ae55b84d (patch)
treeeece66046101c70a3e444bdc9ced0816902f9179 /sublab_project
parentef4cd0cd704e186dafafcc44c263e3bb0a647adb (diff)
Improved models.
Diffstat (limited to 'sublab_project')
-rw-r--r--sublab_project/news/models.py2
-rw-r--r--sublab_project/projects/models.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/sublab_project/news/models.py b/sublab_project/news/models.py
index d1a4c69..72074a0 100644
--- a/sublab_project/news/models.py
+++ b/sublab_project/news/models.py
@@ -13,7 +13,7 @@ class News(models.Model):
title = models.CharField('Titel', max_length=255)
slug = models.SlugField('Slug', unique=True)
content = models.TextField('Inhalt',
- help_text='Es kann Creole als Markup benutzt werden.')
+ help_text='Es kann <a href="http://wikicreole.org/" target="blank">Creole als Markup</a> benutzt werden.')
content_html = models.TextField(editable=False)
projects = models.ManyToManyField(Project, blank=True,
related_name='news', verbose_name='Projekte')
diff --git a/sublab_project/projects/models.py b/sublab_project/projects/models.py
index 0687216..eb496bf 100644
--- a/sublab_project/projects/models.py
+++ b/sublab_project/projects/models.py
@@ -11,7 +11,8 @@ class Project(models.Model):
"""
name = models.CharField('Name', max_length=100)
slug = models.SlugField('Slug', unique=True)
- description = models.TextField('Beschreibung')
+ description = models.TextField('Beschreibung',
+ help_text='Es kann <a href="http://wikicreole.org/" target="blank">Creole als Markup</a> benutzt werden.')
description_html = models.TextField(editable=False)
contact_email = models.EmailField('E-Mail', blank=True)
contact_url = models.URLField('URL', blank=True)
@@ -36,4 +37,4 @@ class Project(models.Model):
@models.permalink
def get_absolute_url(self):
- return ('projects_detail', (), {'id': self.id})
+ return ('projects_detail', (), {'slug': self.slug})