Skip to content

D
django-wiki
Commit bf09bf4f by benjaoming
Options

Changing the urlpatterns to always prioritize paths over IDs if a path string is… 

Changing the urlpatterns to always prioritize paths over IDs if a path string is supplied -- even an empty one for the root article. Also modifying models in pluginbase to not be abstract such that it is possible to generically access all types of plugins.
parent 33186aa0
Showing with 264 additions and 153 deletions
TODO.md
...@@ -16,6 +16,7 @@ Not implemented - will be ASAP ...@@ -16,6 +16,7 @@ Not implemented - will be ASAP
* South migrations **Soon** * South migrations **Soon**
* View source for read-only articles + locked status * View source for read-only articles + locked status
* Global moderator permission **Almost done** (need to add grant form for users with *grant* permissions) * Global moderator permission **Almost done** (need to add grant form for users with *grant* permissions)
* Are you sure you wanna leave this page?
Ideas Ideas
===== =====
......
wiki/forms.py
...@@ -11,6 +11,7 @@ from itertools import chain ...@@ -11,6 +11,7 @@ from itertools import chain
from wiki import models from wiki import models
from wiki.editors import editor from wiki.editors import editor
from wiki.core.diff import simple_merge from wiki.core.diff import simple_merge
from django.forms.widgets import HiddenInput
class CreateRoot(forms.Form): class CreateRoot(forms.Form):
...@@ -219,3 +220,14 @@ class PermissionsForm(forms.ModelForm): ...@@ -219,3 +220,14 @@ class PermissionsForm(forms.ModelForm):
class Meta: class Meta:
model = models.Article model = models.Article
fields = ('group', 'group_read', 'group_write', 'other_read', 'other_write') fields = ('group', 'group_read', 'group_write', 'other_read', 'other_write')
class DeleteForm(forms.Form):
confirm = forms.BooleanField(required=False)
purge = forms.BooleanField(widget=HiddenInput(), required=False)
def clean(self):
cd = self.cleaned_data
if not cd['confirm']:
raise forms.ValidationError(_(u'You are not sure enough!'))
wiki/models/__init__.py
...@@ -48,3 +48,25 @@ from wiki.core.plugins_load import load_wiki_plugins ...@@ -48,3 +48,25 @@ from wiki.core.plugins_load import load_wiki_plugins
load_wiki_plugins() load_wiki_plugins()
from django.core import urlresolvers
original_django_reverse = urlresolvers.reverse
def reverse(*args, **kwargs):
"""Now this is a crazy and silly hack, but it is basically here to
enforce that an empty path always takes precedence over an article_id
such that the root article doesn't get resolved to /ID/ but /."""
if args[0].startswith('wiki:'):
url_kwargs = kwargs.get('kwargs', {})
path = url_kwargs.get('path', False)
# If a path is supplied then discard the article_id
if path != False:
url_kwargs.pop('article_id', None)
url_kwargs['path'] = path
kwargs['kwargs'] = url_kwargs
return original_django_reverse(*args, **kwargs)
# Now we redefine reverse method
urlresolvers.reverse = reverse
\ No newline at end of file
wiki/models/article.py
...@@ -9,6 +9,7 @@ from django.utils.translation import ugettext_lazy as _ ...@@ -9,6 +9,7 @@ from django.utils.translation import ugettext_lazy as _
from wiki.conf import settings from wiki.conf import settings
from wiki.core import article_markdown, plugins_registry from wiki.core import article_markdown, plugins_registry
from wiki import managers from wiki import managers
from mptt.models import MPTTModel
class Article(models.Model): class Article(models.Model):
...@@ -69,7 +70,7 @@ class Article(models.Model): ...@@ -69,7 +70,7 @@ class Article(models.Model):
return False return False
def decendant_objects(self): def decendant_objects(self):
for obj in self.objectforarticle_set.filter(has_parent_field=True): for obj in self.objectforarticle_set.filter(is_mptt=True):
for decendant in obj.get_decendants(): for decendant in obj.get_decendants():
yield decendant yield decendant
...@@ -115,11 +116,11 @@ class Article(models.Model): ...@@ -115,11 +116,11 @@ class Article(models.Model):
def add_object_relation(self, obj): def add_object_relation(self, obj):
content_type = ContentType.objects.get_for_model(obj) content_type = ContentType.objects.get_for_model(obj)
has_parent_field = hasattr(obj, 'parent') is_mptt = isinstance(obj, MPTTModel)
rel = ArticleForObject.objects.get_or_create(article=self, rel = ArticleForObject.objects.get_or_create(article=self,
content_type=content_type, content_type=content_type,
object_id=obj.id, object_id=obj.id,
has_parent_method=has_parent_field) is_mptt=is_mptt)
return rel return rel
@classmethod @classmethod
...@@ -159,7 +160,7 @@ class ArticleForObject(models.Model): ...@@ -159,7 +160,7 @@ class ArticleForObject(models.Model):
object_id = models.PositiveIntegerField(_('object ID')) object_id = models.PositiveIntegerField(_('object ID'))
content_object = generic.GenericForeignKey(ct_field="content_type", fk_field="object_id") content_object = generic.GenericForeignKey(ct_field="content_type", fk_field="object_id")
has_parent_method = models.BooleanField(default=False, editable=False) is_mptt = models.BooleanField(default=False, editable=False)
class Meta: class Meta:
app_label = settings.APP_LABEL app_label = settings.APP_LABEL
...@@ -168,7 +169,9 @@ class ArticleForObject(models.Model): ...@@ -168,7 +169,9 @@ class ArticleForObject(models.Model):
# Do not allow several objects # Do not allow several objects
unique_together = ('content_type', 'object_id') unique_together = ('content_type', 'object_id')
class BaseRevision(models.Model): class BaseRevisionMixin(models.Model):
"""This is an abstract model used as a mixin: Do not override any of the
core model methods but respect the inheritor's freedom to do so itself."""
revision_number = models.IntegerField(editable=False, verbose_name=_(u'revision number')) revision_number = models.IntegerField(editable=False, verbose_name=_(u'revision number'))
...@@ -200,11 +203,8 @@ class BaseRevision(models.Model): ...@@ -200,11 +203,8 @@ class BaseRevision(models.Model):
class Meta: class Meta:
abstract = True abstract = True
app_label = settings.APP_LABEL
get_latest_by = ('revision_number',)
ordering = ('created',)
class ArticleRevision(BaseRevision): class ArticleRevision(BaseRevisionMixin, models.Model):
"""This is where main revision data is stored. To make it easier to """This is where main revision data is stored. To make it easier to
copy, do NEVER create m2m relationships.""" copy, do NEVER create m2m relationships."""
...@@ -266,3 +266,10 @@ class ArticleRevision(BaseRevision): ...@@ -266,3 +266,10 @@ class ArticleRevision(BaseRevision):
self.article.save() self.article.save()
if not self.title: if not self.title:
self.title = self.article.title self.title = self.article.title
class Meta:
app_label = settings.APP_LABEL
get_latest_by = ('revision_number',)
ordering = ('created',)
unique_together = ('article', 'revision_number')
\ No newline at end of file
wiki/models/pluginbase.py
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.db.models import signals
""" """
There are two kinds of plugin objects: There are two kinds of plugin objects:
...@@ -18,26 +19,36 @@ There are two kinds of plugin objects: ...@@ -18,26 +19,36 @@ There are two kinds of plugin objects:
from article import Article, ArticleRevision from article import Article, ArticleRevision
from wiki.conf import settings
class ArticlePlugin(models.Model): class ArticlePlugin(models.Model):
"""Always extend from this if you're making a plugin. That way, a deletion
of an article will CASCADE to your plugin, and the database will be kept
clean. Furthermore, it's possible to list all plugins and maintain generic
properties in the future..."""
article = models.ForeignKey(Article, on_delete=models.CASCADE, article = models.ForeignKey(Article, on_delete=models.CASCADE,
verbose_name=_(u"article")) verbose_name=_(u"article"))
created = models.DateTimeField(auto_now_add=True, verbose_name=_(u"created"))
modified = models.DateTimeField(auto_now=True, verbose_name=_(u"created"))
deleted = models.BooleanField(default=False) deleted = models.BooleanField(default=False)
def purge(self):
"""Remove related contents completely, ie. media files."""
pass
class Meta: class Meta:
abstract = True app_label = settings.APP_LABEL
class ReusablePlugin(ArticlePlugin):
class ReusablePlugin(ArticlePlugin):
"""Extend from this model if you have a plugin that may be related to many
articles. Please note that the ArticlePlugin.article ForeignKey STAYS! This
is in order to maintain an explicit set of permissions. If you do not like this,
you can override can_read and can_write."""
# The article on which the plugin was originally created. # The article on which the plugin was originally created.
# Used to apply permissions. # Used to apply permissions.
ArticlePlugin.article.on_delete=models.SET_NULL
ArticlePlugin.article.verbose_name=_(u'original article') ArticlePlugin.article.verbose_name=_(u'original article')
ArticlePlugin.article.help_text=_(u'Permissions are inherited from this article') ArticlePlugin.article.help_text=_(u'Permissions are inherited from this article')
ArticlePlugin.article.on_delete=models.SET_NULL
ArticlePlugin.article.null = True ArticlePlugin.article.null = True
ArticlePlugin.article.blank = True ArticlePlugin.article.blank = True
...@@ -54,9 +65,6 @@ class ReusablePlugin(ArticlePlugin): ...@@ -54,9 +65,6 @@ class ReusablePlugin(ArticlePlugin):
return self.article.can_write(*args, **kwargs) return self.article.can_write(*args, **kwargs)
return False return False
class Meta:
abstract = True
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# Automatically make the original article the first one in the added set # Automatically make the original article the first one in the added set
...@@ -67,24 +75,30 @@ class ReusablePlugin(ArticlePlugin): ...@@ -67,24 +75,30 @@ class ReusablePlugin(ArticlePlugin):
super(ReusablePlugin, self).save(*args, **kwargs) super(ReusablePlugin, self).save(*args, **kwargs)
class Meta:
app_label = settings.APP_LABEL
class RevisionPluginCreateError(Exception): pass class RevisionPluginCreateError(Exception): pass
class RevisionPlugin(models.Model): class RevisionPlugin(ArticlePlugin):
""" """
Inherit from this model and make sure to specify an article when Inherit from this model and make sure to specify an article when
saving a new instance. This way, a new revision will be created, and saving a new instance. This way, a new revision will be created, and
users are able to roll back to the a previous revision (containing some users are able to roll back to the a previous revision (in which your
other instance of your plugin). plugin wasn't related to the article).
Furthermore, your plugin relation is kept when new revisions are created.
Usage: Usage:
class YourPlugin(RevisionPlugin): class YourPlugin(RevisionPlugin):
... ...
Creating new plugins: Creating new plugins instances:
YourPlugin(article=article_instance, ...) or YourPlugin(article=article_instance, ...) or
YourPlugin.objects.create(article=article_instance, ...) YourPlugin.objects.create(article=article_instance, ...)
""" """
revision = models.ForeignKey(ArticleRevision, on_delete=models.CASCADE) revision = models.ForeignKey(ArticleRevision, on_delete=models.CASCADE)
...@@ -109,5 +123,22 @@ class RevisionPlugin(models.Model): ...@@ -109,5 +123,22 @@ class RevisionPlugin(models.Model):
self.revision = new_revision self.revision = new_revision
class Meta: class Meta:
abstract = True app_label = settings.APP_LABEL
######################################################
# SIGNAL HANDLERS
######################################################
# Look at me. I'm a plane.
# And the plane becomes a metaphor for my life.
# It's my art, when I disguise my body in the shape of a plane.
# (Shellac, 1993)
def update_revision_plugins(instance, *args, **kwargs):
"""Every time a new article revision is created, we update all active
plugins to match this article revision"""
if kwargs.get('created', False):
p_revisions = RevisionPlugin.objects.filter(article=instance.article, deleted=False)
p_revisions.update(revision=instance)
signals.post_save.connect(update_revision_plugins, ArticleRevision)
\ No newline at end of file
wiki/models/urlpath.py
...@@ -56,7 +56,7 @@ class URLPath(MPTTModel): ...@@ -56,7 +56,7 @@ class URLPath(MPTTModel):
super(URLPath, self).save(*args, **kwargs) super(URLPath, self).save(*args, **kwargs)
def delete(self, *args, **kwargs): def delete(self, *args, **kwargs):
assert not self.parent and self.get_children(), "You cannot delete a root article with children." assert not (self.parent and self.get_children()), "You cannot delete a root article with children."
super(URLPath, self).delete(*args, **kwargs) super(URLPath, self).delete(*args, **kwargs)
class Meta: class Meta:
......
wiki/plugins/attachments/markdown_extensions.py
...@@ -24,12 +24,15 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor): ...@@ -24,12 +24,15 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor):
m = ATTACHMENT_RE.match(line) m = ATTACHMENT_RE.match(line)
if m: if m:
attachment_id = m.group('id').strip() attachment_id = m.group('id').strip()
attachment = models.Attachment.objects.get(article=self.markdown.article, try:
attachment = models.Attachment.objects.get(article=self.markdown.article,
id=attachment_id) id=attachment_id)
url = reverse('wiki:attachments_download', kwargs={'article_id': self.markdown.article.id, url = reverse('wiki:attachments_download', kwargs={'article_id': self.markdown.article.id,
'attachment_id':attachment.id,}) 'attachment_id':attachment.id,})
line = line.replace(m.group(1), u"""<span class="attachment"><a href="%s" title="%s">%s</a>""" % line = line.replace(m.group(1), u"""<span class="attachment"><a href="%s" title="%s">%s</a>""" %
(url, _(u"Click to download file"), attachment.original_filename)) (url, _(u"Click to download file"), attachment.original_filename))
except models.Attachment.DoesNotExist:
line = line.replace(m.group(1), u"""<span class="attachment attachment-deleted">Attachment with ID #%s is deleted.</span>""" % attachment_id)
new_text.append(line) new_text.append(line)
return new_text return new_text
wiki/plugins/attachments/models.py
...@@ -6,7 +6,7 @@ import settings ...@@ -6,7 +6,7 @@ import settings
from wiki import managers from wiki import managers
from wiki.conf import settings as wiki_settings from wiki.conf import settings as wiki_settings
from wiki.models.pluginbase import ReusablePlugin from wiki.models.pluginbase import ReusablePlugin
from wiki.models.article import BaseRevision from wiki.models.article import BaseRevisionMixin
class IllegalFileExtension(Exception): class IllegalFileExtension(Exception):
"""File extension on upload is not allowed""" """File extension on upload is not allowed"""
...@@ -63,7 +63,7 @@ def upload_path(instance, filename): ...@@ -63,7 +63,7 @@ def upload_path(instance, filename):
return path.join(upload_path, filename + '.upload') return path.join(upload_path, filename + '.upload')
class AttachmentRevision(BaseRevision): class AttachmentRevision(BaseRevisionMixin, models.Model):
attachment = models.ForeignKey('Attachment') attachment = models.ForeignKey('Attachment')
...@@ -75,6 +75,7 @@ class AttachmentRevision(BaseRevision): ...@@ -75,6 +75,7 @@ class AttachmentRevision(BaseRevision):
class Meta: class Meta:
verbose_name = _(u'attachment revision') verbose_name = _(u'attachment revision')
verbose_name_plural = _(u'attachment revisions') verbose_name_plural = _(u'attachment revisions')
ordering = ('created',)
get_latest_by = ('revision_number',) get_latest_by = ('revision_number',)
app_label = wiki_settings.APP_LABEL app_label = wiki_settings.APP_LABEL
......
wiki/plugins/attachments/views.py
...@@ -32,7 +32,7 @@ class AttachmentView(ArticleMixin, FormView): ...@@ -32,7 +32,7 @@ class AttachmentView(ArticleMixin, FormView):
return super(AttachmentView, self).dispatch(request, article, *args, **kwargs) return super(AttachmentView, self).dispatch(request, article, *args, **kwargs)
# WARNING! The below decorator silences other exceptions that may occur! # WARNING! The below decorator silences other exceptions that may occur!
@transaction.commit_manually #@transaction.commit_manually
def form_valid(self, form): def form_valid(self, form):
try: try:
attachment_revision = form.save(commit=False) attachment_revision = form.save(commit=False)
...@@ -48,14 +48,12 @@ class AttachmentView(ArticleMixin, FormView): ...@@ -48,14 +48,12 @@ class AttachmentView(ArticleMixin, FormView):
except models.IllegalFileExtension, e: except models.IllegalFileExtension, e:
transaction.rollback() transaction.rollback()
messages.error(self.request, _(u'Your file could not be saved: %s') % e) messages.error(self.request, _(u'Your file could not be saved: %s') % e)
except Exception: #except Exception:
transaction.rollback() # transaction.rollback()
messages.error(self.request, _(u'Your file could not be saved, probably because of a permission error on the web server.')) # messages.error(self.request, _(u'Your file could not be saved, probably because of a permission error on the web server.'))
transaction.commit() #transaction.commit()
if self.urlpath: return redirect("wiki:attachments_index", path=self.urlpath.path, article_id=self.article.id)
return redirect("wiki:attachments_index", self.urlpath.path)
# TODO: What if no urlpath?
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs['attachments'] = self.attachments kwargs['attachments'] = self.attachments
...@@ -102,10 +100,7 @@ class AttachmentReplaceView(ArticleMixin, FormView): ...@@ -102,10 +100,7 @@ class AttachmentReplaceView(ArticleMixin, FormView):
self.attachment.save() self.attachment.save()
messages.success(self.request, _(u'%s uploaded and replaces old attachment.') % attachment_revision.get_filename()) messages.success(self.request, _(u'%s uploaded and replaces old attachment.') % attachment_revision.get_filename())
if self.urlpath: return redirect("wiki:attachments_index", path=self.urlpath.path, article_id=self.article.id)
return redirect("wiki:attachments_index", self.urlpath.path)
# TODO: What if we do not have a urlpath?
def get_form(self, form_class): def get_form(self, form_class):
form = FormView.get_form(self, form_class) form = FormView.get_form(self, form_class)
...@@ -157,11 +152,7 @@ class AttachmentChangeRevisionView(ArticleMixin, View): ...@@ -157,11 +152,7 @@ class AttachmentChangeRevisionView(ArticleMixin, View):
self.attachment.save() self.attachment.save()
messages.success(self.request, _(u'Current revision changed for %s.') % self.attachment.original_filename) messages.success(self.request, _(u'Current revision changed for %s.') % self.attachment.original_filename)
if self.urlpath: return redirect("wiki:attachments_index", path=self.urlpath.path, article_id=self.article.id)
return redirect("wiki:attachments_index", path=self.urlpath.path)
# TODO: What if this hasn't got a urlpath.
else:
pass
class AttachmentAddView(ArticleMixin, View): class AttachmentAddView(ArticleMixin, View):
...@@ -177,11 +168,7 @@ class AttachmentAddView(ArticleMixin, View): ...@@ -177,11 +168,7 @@ class AttachmentAddView(ArticleMixin, View):
messages.success(self.request, _(u'Added a reference to "%(att)s" from "%(art)s".') % messages.success(self.request, _(u'Added a reference to "%(att)s" from "%(art)s".') %
{'att': self.attachment.original_filename, {'att': self.attachment.original_filename,
'art': self.article.current_revision.title}) 'art': self.article.current_revision.title})
if self.urlpath: return redirect("wiki:attachments_index", path=self.urlpath.path, article_id=self.article.id)
return redirect("wiki:attachments_index", path=self.urlpath.path)
# TODO: What if this hasn't got a urlpath.
else:
pass
class AttachmentDeleteView(ArticleMixin, FormView): class AttachmentDeleteView(ArticleMixin, FormView):
...@@ -214,9 +201,7 @@ class AttachmentDeleteView(ArticleMixin, FormView): ...@@ -214,9 +201,7 @@ class AttachmentDeleteView(ArticleMixin, FormView):
self.attachment.articles.remove(self.article) self.attachment.articles.remove(self.article)
messages.info(self.request, _(u'This article is no longer related to the file %s.') % self.attachment.original_filename) messages.info(self.request, _(u'This article is no longer related to the file %s.') % self.attachment.original_filename)
if self.urlpath: return redirect("wiki:get", path=self.urlpath.path, article_id=self.article.id)
return redirect("wiki:get_url", path=self.urlpath.path)
# TODO: No urlpath?
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs['attachment'] = self.attachment kwargs['attachment'] = self.attachment
......
wiki/plugins/notifications/models.py
...@@ -19,12 +19,13 @@ class ArticleSubscription(wiki_models.pluginbase.ArticlePlugin, Subscription): ...@@ -19,12 +19,13 @@ class ArticleSubscription(wiki_models.pluginbase.ArticlePlugin, Subscription):
'article': self.article.current_revision.title, 'article': self.article.current_revision.title,
'type': self.notification_type.label}) 'type': self.notification_type.label})
def default_url(article): def default_url(article, urlpath=None):
try: try:
urlpath = wiki_models.URLPath.objects.get(articles=article) if not urlpath:
url = reverse('wiki:get_url', args=(urlpath.path,)) urlpath = wiki_models.URLPath.objects.get(articles=article)
url = reverse('wiki:get', kwargs={'path': urlpath.path})
except wiki_models.URLPath.DoesNotExist: except wiki_models.URLPath.DoesNotExist:
url = None url = reverse('wiki:get', kwargs={'article_id': article.id})
return url return url
def post_article_save(instance, **kwargs): def post_article_save(instance, **kwargs):
......
wiki/templates/wiki/create.html
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<form method="POST" class="form-horizontal"> <form method="POST" class="form-horizontal">
{% wiki_form create_form %} {% wiki_form create_form %}
<div class="form-actions"> <div class="form-actions">
<a href="{% url 'wiki:get_url' parent_urlpath.path %}" class="btn btn-large"> <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="btn btn-large">
<span class="icon-circle-arrow-left"></span> <span class="icon-circle-arrow-left"></span>
{% trans "Go back" %} {% trans "Go back" %}
</a> </a>
......
wiki/templates/wiki/delete.html 0 → 100644
{% extends "wiki/base.html" %}
{% load wiki_tags i18n sekizai_tags %}
{% load url from future %}
{% block pagetitle %}{% trans "Delete article" %}{% endblock %}
{% block wiki_contents %}
{% include "wiki/includes/editormedia.html" %}
<h1 class="page-header">{% trans "Delete" %} "{{ article.current_revision.title }}"?</h1>
<form method="POST" class="form-horizontal">
{% wiki_form create_form %}
<div class="form-actions">
<a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="btn btn-large">
<span class="icon-circle-arrow-left"></span>
{% trans "Go back" %}
</a>
<button type="submit" name="save_changes" class="btn btn-primary btn-large">
<span class="icon-plus"></span>
{% trans "Create article" %}
</button>
</div>
</form>
{% endblock %}
wiki/templates/wiki/edit.html
...@@ -26,16 +26,16 @@ ...@@ -26,16 +26,16 @@
<form method="POST" class="form-horizontal"> <form method="POST" class="form-horizontal">
{% include "wiki/includes/editor.html" %} {% include "wiki/includes/editor.html" %}
<div class="form-actions"> <div class="form-actions">
<button type="submit" name="preview" value="1" class="btn btn-large" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.action='{% url 'wiki:preview_url' urlpath.path %}'"> <button type="submit" name="preview" value="1" class="btn btn-large" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.action='{% url 'wiki:preview' path=urlpath.path article_id=article.id %}'">
<span class="icon-eye-open"></span> <span class="icon-eye-open"></span>
{% trans "Preview" %} {% trans "Preview" %}
</button> </button>
<button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit_url' urlpath.path %}'"> <button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'">
<span class="icon-ok"></span> <span class="icon-ok"></span>
{% trans "Save changes" %} {% trans "Save changes" %}
</button> </button>
<a class="pull-right btn btn-danger"> <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="pull-right btn btn-danger">
<span class="icon-trash"></span> <span class="icon-trash"></span>
{% trans "Delete article" %} {% trans "Delete article" %}
</a> </a>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<span class="icon-circle-arrow-left"></span> <span class="icon-circle-arrow-left"></span>
{% trans "Back to editor" %} {% trans "Back to editor" %}
</a> </a>
<button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit_url' urlpath.path %}'"> <button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'">
<span class="icon-ok"></span> <span class="icon-ok"></span>
{% trans "Save changes" %} {% trans "Save changes" %}
</button> </button>
......
wiki/templates/wiki/history.html
...@@ -97,18 +97,18 @@ ...@@ -97,18 +97,18 @@
{% trans "Preview this version" %} {% trans "Preview this version" %}
</a> </a>
{% else %} {% else %}
<button type="submit" class="btn" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.r.value='{{ revision.id }}'; this.form.action='{% url 'wiki:preview_revision' article.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision_url' urlpath.path revision.id %}')"> <button type="submit" class="btn" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.r.value='{{ revision.id }}'; this.form.action='{% url 'wiki:preview_revision' article.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}')">
<span class="icon-eye-open"></span> <span class="icon-eye-open"></span>
{% trans "Preview this version" %} {% trans "Preview this version" %}
</button> </button>
{% endif %} {% endif %}
<a class="btn btn-info" href="#collapse{{ revision.revision_number }}" onclick="get_diff_json('{% url 'wiki:diff' revision.id %}', $('#collapse{{ revision.revision_number }}'))"> <a class="btn btn-info" href="#collapse{{ revision.revision_number }}" onclick="get_diff_json('{% url 'wiki:diff' revision_id=revision.id %}', $('#collapse{{ revision.revision_number }}'))">
<span class="icon-list-alt"></span> <span class="icon-list-alt"></span>
{% trans "Show changes" %} {% trans "Show changes" %}
</a> </a>
{% if article|can_write:user %} {% if article|can_write:user %}
<input type="radio"{% if revision == article.current_revision %} disabled="true"{% endif %} style="margin: 0 10px;" value="{{ revision.id }}" name="revision_id" switch-button-href="{% url 'wiki:change_revision_url' urlpath.path revision.id %}" merge-button-href="{% url 'wiki:merge_revision_preview' article.id revision.id %}" merge-button-commit-href="{% url 'wiki:merge_revision_url' urlpath.path revision.id %}" /> <input type="radio"{% if revision == article.current_revision %} disabled="true"{% endif %} style="margin: 0 10px;" value="{{ revision.id }}" name="revision_id" switch-button-href="{% url 'wiki:change_revision' path=urlpath.path revision_id=revision.id %}" merge-button-href="{% url 'wiki:merge_revision_preview' article_id=article.id revision_id=revision.id %}" merge-button-commit-href="{% url 'wiki:merge_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}" />
{% endif %} {% endif %}
</div> </div>
......
wiki/templates/wiki/includes/article_menu.html
...@@ -3,76 +3,36 @@ ...@@ -3,76 +3,36 @@
{% for plugin in plugins %} {% for plugin in plugins %}
{% if plugin.article_tab %} {% if plugin.article_tab %}
<li class="pull-right{% if selected == plugin.slug %} active{% endif %}"> <li class="pull-right{% if selected == plugin.slug %} active{% endif %}">
{% if urlpath %} <a href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}">
<a href="{% url 'wiki:plugin_url' path=urlpath.path slug=plugin.slug %}">
<span class="{{ plugin.article_tab.1 }}"></span> <span class="{{ plugin.article_tab.1 }}"></span>
{{ plugin.article_tab.0 }} {{ plugin.article_tab.0 }}
</a> </a>
{% else %}
<a href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id %}">
<span class="{{ plugin.article_tab.1 }}"></span>
{{ plugin.article_tab.0 }}
</a>
{% endif %}
</li> </li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if urlpath %}
<li class="pull-right{% if selected == "settings" %} active{% endif %}">
{% if not user.is_anonymous %}
<a href="{% url 'wiki:settings_url' path=urlpath.path %}">
<span class="icon-wrench"></span>
{% trans "Settings" %}
</a>
{% endif %}
</li>
<li class="pull-right{% if selected == "history" %} active{% endif %}">
<a href="{% url 'wiki:history_url' urlpath.path %}">
<span class="icon-time"></span>
{% trans "Changes" %}
</a>
</li>
<li class="pull-right{% if selected == "edit" %} active{% endif %}">
<a href="{% url 'wiki:edit_url' urlpath.path %}">
<span class="icon-edit"></span>
{% trans "Edit" %}
</a>
</li>
<li class="pull-right{% if selected == "view" %} active{% endif %}">
<a href="{% url 'wiki:get_url' urlpath.path %}">
<span class="icon-home"></span>
{% trans "View" %}
</a>
</li>
{% else %}
<li class="pull-right{% if selected == "settings" %} active{% endif %}"> <li class="pull-right{% if selected == "settings" %} active{% endif %}">
{% if not user.is_anonymous %} {% if not user.is_anonymous %}
<a href="{% url 'wiki:settings' article_id=article.id %}"> <a href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}">
<span class="icon-wrench"></span> <span class="icon-wrench"></span>
{% trans "Settings" %} {% trans "Settings" %}
</a> </a>
{% endif %} {% endif %}
</li> </li>
<li class="pull-right{% if selected == "history" %} active{% endif %}"> <li class="pull-right{% if selected == "history" %} active{% endif %}">
<a href="{% url 'wiki:history' article_id=article.id %}"> <a href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}">
<span class="icon-time"></span> <span class="icon-time"></span>
{% trans "Changes" %} {% trans "Changes" %}
</a> </a>
</li> </li>
<li class="pull-right{% if selected == "edit" %} active{% endif %}"> <li class="pull-right{% if selected == "edit" %} active{% endif %}">
<a href="{% url 'wiki:edit' article_id=article.id %}"> <a href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}">
<span class="icon-edit"></span> <span class="icon-edit"></span>
{% trans "Edit" %} {% trans "Edit" %}
</a> </a>
</li> </li>
<li class="pull-right{% if selected == "view" %} active{% endif %}"> <li class="pull-right{% if selected == "view" %} active{% endif %}">
<a href="{% url 'wiki:get' article_id=article.id %}"> <a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}">
<span class="icon-home"></span> <span class="icon-home"></span>
{% trans "View" %} {% trans "View" %}
</a> </a>
</li> </li>
{% endif %}
wiki/templates/wiki/includes/breadcrumbs.html
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<ul class="breadcrumb pull-left" class=""> <ul class="breadcrumb pull-left" class="">
{% for ancestor in urlpath.get_ancestors.all %} {% for ancestor in urlpath.get_ancestors.all %}
<span class="divider">/</span> <span class="divider">/</span>
<li><a href="{% url 'wiki:get_url' ancestor.path %}">{{ ancestor.article.current_revision.title }}</a></li> <li><a href="{% url 'wiki:get' path=ancestor.path %}">{{ ancestor.article.current_revision.title }}</a></li>
{% endfor %} {% endfor %}
<span class="divider">/</span> <span class="divider">/</span>
<li class="active"><a href="{% url 'wiki:get_url' urlpath.path %}">{{ article.current_revision.title }}</a></li> <li class="active"><a href="{% url 'wiki:get' path=urlpath.path %}">{{ article.current_revision.title }}</a></li>
<span class="divider">/</span> <span class="divider">/</span>
</ul> </ul>
<div class="pull-left" style="margin-left: 10px;"> <div class="pull-left" style="margin-left: 10px;">
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{% for child in urlpath.get_children %} {% for child in urlpath.get_children %}
<li> <li>
<a href="{% url 'wiki:get_url' child.path %}"> <a href="{% url 'wiki:get' path=child.path %}">
{{ child.article.current_revision.title }} {{ child.article.current_revision.title }}
</a> </a>
</li> </li>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</div> </div>
</div> </div>
<div class="pull-left" style="margin-left: 10px;"> <div class="pull-left" style="margin-left: 10px;">
<a class="btn" href="{% url 'wiki:create_url' urlpath.path %}" style="padding: 7px;"> <a class="btn" href="{% url 'wiki:create' path=urlpath.path %}" style="padding: 7px;">
<span class="icon-plus"></span> <span class="icon-plus"></span>
{% trans "Add article" %} {% trans "Add article" %}
</a> </a>
......
wiki/urls.py
...@@ -8,7 +8,7 @@ from wiki.core import plugins_registry ...@@ -8,7 +8,7 @@ from wiki.core import plugins_registry
urlpatterns = patterns('', urlpatterns = patterns('',
url('^$', article.ArticleView.as_view(), name='root', kwargs={'path': ''}), url('^$', article.ArticleView.as_view(), name='root', kwargs={'path': ''}),
url('^create-root/$', 'wiki.views.article.root_create', name='root_create'), url('^create-root/$', 'wiki.views.article.root_create', name='root_create'),
url('^_revision/diff/(\d+)/$', 'wiki.views.article.diff', name='diff'), url('^_revision/diff/(?P<revision_id>\d+)/$', 'wiki.views.article.diff', name='diff'),
) )
if settings.ACCOUNT_HANDLING: if settings.ACCOUNT_HANDLING:
...@@ -21,12 +21,12 @@ if settings.ACCOUNT_HANDLING: ...@@ -21,12 +21,12 @@ if settings.ACCOUNT_HANDLING:
urlpatterns += patterns('', urlpatterns += patterns('',
# This one doesn't work because it don't know where to redirect after... # This one doesn't work because it don't know where to redirect after...
url('^_revision/change/(?P<article_id>\d+)/(?P<revision_id>\d+)/$', 'wiki.views.article.change_revision', name='change_revision'), url('^_revision/change/(?P<article_id>\d+)/(?P<revision_id>\d+)/$', 'wiki.views.article.change_revision', name='change_revision'),
url('^_revision/preview/(?P<article_id>\d+)/$', 'wiki.views.article.preview', name='preview_revision'), url('^_revision/preview/(?P<article_id>\d+)/$', 'wiki.views.article.preview', name='preview_revision'),
url('^_revision/merge/(?P<article_id>\d+)/(?P<revision_id>\d+)/preview/$', 'wiki.views.article.merge', name='merge_revision_preview', kwargs={'preview': True}), url('^_revision/merge/(?P<article_id>\d+)/(?P<revision_id>\d+)/preview/$', 'wiki.views.article.merge', name='merge_revision_preview', kwargs={'preview': True}),
# Paths decided by article_ids # Paths decided by article_ids
url('^(?P<article_id>\d+)/$', article.ArticleView.as_view(), name='get'), url('^(?P<article_id>\d+)/$', article.ArticleView.as_view(), name='get'),
url('^(?P<article_id>\d+)/delete/$', article.Delete.as_view(), name='delete'),
url('^(?P<article_id>\d+)/edit/$', article.Edit.as_view(), name='edit'), url('^(?P<article_id>\d+)/edit/$', article.Edit.as_view(), name='edit'),
url('^(?P<article_id>\d+)/preview/$', 'wiki.views.article.preview', name='preview'), url('^(?P<article_id>\d+)/preview/$', 'wiki.views.article.preview', name='preview'),
url('^(?P<article_id>\d+)/history/$', article.History.as_view(), name='history'), url('^(?P<article_id>\d+)/history/$', article.History.as_view(), name='history'),
...@@ -42,32 +42,28 @@ for plugin in plugins_registry._cache.values(): ...@@ -42,32 +42,28 @@ for plugin in plugins_registry._cache.values():
plugin_urlpatterns = getattr(plugin, 'urlpatterns', None) plugin_urlpatterns = getattr(plugin, 'urlpatterns', None)
if slug and plugin_urlpatterns: if slug and plugin_urlpatterns:
urlpatterns += patterns('', urlpatterns += patterns('',
url('^(?P<path>.+/|)_plugin/'+slug+'/', include(plugin_urlpatterns)),
url('^(?P<article_id>\d+)(?P<path>)/plugin/'+slug+'/', include(plugin_urlpatterns)),
url('^(?P<article_id>\d+)/plugin/'+slug+'/', include(plugin_urlpatterns)), url('^(?P<article_id>\d+)/plugin/'+slug+'/', include(plugin_urlpatterns)),
url('^(?P<path>.+/|)_plugin/'+slug+'/', include(plugin_urlpatterns)),
) )
urlpatterns += patterns('', urlpatterns += patterns('',
# Paths decided by URLs # Paths decided by URLs
url('^(?P<path>.+/|)_create/$', article.Create.as_view(), name='create_url'), url('^(?P<path>.+/|)_create/$', article.Create.as_view(), name='create'),
url('^(?P<path>.+/|)_edit/$', article.Edit.as_view(), name='edit_url'), url('^(?P<path>.+/|)_delete/$', article.Edit.as_view(), name='delete'),
url('^(?P<path>.+/|)_preview/$', 'wiki.views.article.preview', name='preview_url'), url('^(?P<path>.+/|)_edit/$', article.Edit.as_view(), name='edit'),
url('^(?P<path>.+/|)_history/$', article.History.as_view(), name='history_url'), url('^(?P<path>.+/|)_preview/$', 'wiki.views.article.preview', name='preview'),
url('^(?P<path>.+/|)_settings/$', article.Settings.as_view(), name='settings_url'), url('^(?P<path>.+/|)_history/$', article.History.as_view(), name='history'),
url('^(?P<path>.+/|)_revision/change/(?P<revision_id>\d+)/$', 'wiki.views.article.change_revision', name='change_revision_url'), url('^(?P<path>.+/|)_settings/$', article.Settings.as_view(), name='settings'),
url('^(?P<path>.+/|)_revision/merge/(?P<revision_id>\d+)/$', 'wiki.views.article.merge', name='merge_revision_url'), url('^(?P<path>.+/|)_revision/change/(?P<revision_id>\d+)/$', 'wiki.views.article.change_revision', name='change_revision'),
url('^(?P<path>.+/|)_plugin/(?P<slug>\w+)/$', article.Plugin.as_view(), name='plugin_url'), url('^(?P<path>.+/|)_revision/merge/(?P<revision_id>\d+)/$', 'wiki.views.article.merge', name='merge_revision'),
url('^(?P<path>.+/|)_plugin/(?P<slug>\w+)/$', article.Plugin.as_view(), name='plugin'),
) url('^(?P<path>.+/|)$', article.ArticleView.as_view(), name='get'),
urlpatterns += patterns('',
url('^(?P<path>.+/|)$', article.ArticleView.as_view(), name='get_url'),
) )
def get_pattern(app_name="wiki", namespace="wiki"): def get_pattern(app_name="wiki", namespace="wiki"):
"""Every url resolution takes place as "wiki:view_name". """Every url resolution takes place as "wiki:view_name".
You should not attempt to have multiple deployments of the wiki on You should not attempt to have multiple deployments of the wiki in a
one site. single Django project.
https://docs.djangoproject.com/en/dev/topics/http/urls/#topics-http-reversing-url-namespaces https://docs.djangoproject.com/en/dev/topics/http/urls/#topics-http-reversing-url-namespaces
""" """
return urlpatterns, app_name, namespace return urlpatterns, app_name, namespace
\ No newline at end of file
wiki/views/article.py
...@@ -18,6 +18,7 @@ from wiki.core.diff import simple_merge ...@@ -18,6 +18,7 @@ from wiki.core.diff import simple_merge
from wiki.decorators import get_article, json_view from wiki.decorators import get_article, json_view
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.db import transaction from django.db import transaction
from wiki.core.exceptions import NoRootURL
class ArticleView(ArticleMixin, TemplateView, ): class ArticleView(ArticleMixin, TemplateView, ):
...@@ -78,14 +79,14 @@ class Create(FormView, ArticleMixin): ...@@ -78,14 +79,14 @@ class Create(FormView, ArticleMixin):
else: else:
messages.error(self.request, _(u"There was an error creating this article.")) messages.error(self.request, _(u"There was an error creating this article."))
transaction.commit() transaction.commit()
return redirect('wiki:get_url', '') return redirect('wiki:get', '')
url = self.get_success_url() url = self.get_success_url()
transaction.commit() transaction.commit()
return url return url
def get_success_url(self): def get_success_url(self):
return redirect('wiki:get_url', self.newpath.path) return redirect('wiki:get', self.newpath.path)
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs['parent_urlpath'] = self.urlpath kwargs['parent_urlpath'] = self.urlpath
...@@ -95,6 +96,56 @@ class Create(FormView, ArticleMixin): ...@@ -95,6 +96,56 @@ class Create(FormView, ArticleMixin):
return super(Create, self).get_context_data(**kwargs) return super(Create, self).get_context_data(**kwargs)
class Delete(FormView, ArticleMixin):
form_class = forms.DeleteForm
template_name="wiki/delete.html"
@method_decorator(get_article(can_write=True))
def dispatch(self, request, article, *args, **kwargs):
super_return = super(Delete, self).dispatch(request, article, *args, **kwargs)
# Where to go after deletion...
self.next = request.GET.get('next', None)
if not self.next:
if self.urlpath:
self.next = reverse('wiki:get', path=self.urlpath.parent.path)
else:
for art_obj in self.objectforarticle_set.filter(is_mptt=True):
self.next = reverse('wiki:get', kwargs={'article_id': art_obj.parent.article.id})
return super_return
def get_initial(self):
return {'revision': self.article.current_revision}
def get_form(self, form_class):
form = FormView.get_form(self, form_class)
if self.request.user.has_perm('wiki.moderator'):
form.fields['purge'].widget = forms.forms.CheckboxInput()
def form_valid(self, form):
cd = form.cleaned_data
if self.request.user.has_perm('wiki.moderator') and cd['purge']:
pass
messages.success(self.request, _(u'This article together with all its contents are now completely gone! Thanks!'))
else:
revision = models.ArticleRevision()
revision.inherit_predecessor(self.article)
revision.deleted = True
self.article.add_revision(revision)
messages.success(self.request, _(u'This article is now marked as deleted! Thanks for keeping the site free from unwanted material!'))
def get_success_url(self):
return redirect(self.next)
def get_context_data(self, **kwargs):
kwargs['parent_urlpath'] = self.urlpath
kwargs['parent_article'] = self.article
kwargs['create_form'] = kwargs.pop('form', None)
kwargs['editor'] = editors.editor
return super(Create, self).get_context_data(**kwargs)
class Edit(FormView, ArticleMixin): class Edit(FormView, ArticleMixin):
form_class = forms.EditForm form_class = forms.EditForm
...@@ -122,12 +173,10 @@ class Edit(FormView, ArticleMixin): ...@@ -122,12 +173,10 @@ class Edit(FormView, ArticleMixin):
return self.get_success_url() return self.get_success_url()
def get_success_url(self): def get_success_url(self):
if not self.urlpath is None: if self.urlpath:
return redirect("wiki:get_url", self.urlpath.path) return redirect("wiki:get", path=self.urlpath.path)
# TODO: Where to go if it's a different object? It's probably return redirect('wiki:get', article_id=self.article.id)
# an ajax callback, so we don't care... but should perhaps return
# a status
return
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs['edit_form'] = kwargs.pop('form', None) kwargs['edit_form'] = kwargs.pop('form', None)
...@@ -198,7 +247,9 @@ class Settings(ArticleMixin, TemplateView): ...@@ -198,7 +247,9 @@ class Settings(ArticleMixin, TemplateView):
usermessage = form.get_usermessage() usermessage = form.get_usermessage()
if usermessage: if usermessage:
messages.success(self.request, usermessage) messages.success(self.request, usermessage)
return redirect('wiki:settings_url', self.urlpath.path) if self.urlpath:
return redirect('wiki:settings', path=self.urlpath.path)
return redirect('wiki:settings', article_id=self.article.id)
else: else:
form = Form(self.article, self.request.user) form = Form(self.article, self.request.user)
self.forms.append(form) self.forms.append(form)
...@@ -211,7 +262,9 @@ class Settings(ArticleMixin, TemplateView): ...@@ -211,7 +262,9 @@ class Settings(ArticleMixin, TemplateView):
return super(Settings, self).get(*args, **kwargs) return super(Settings, self).get(*args, **kwargs)
def get_success_url(self): def get_success_url(self):
return redirect('wiki:settings_url', self.urlpath.path) if self.urlpath:
return redirect('wiki:settings', path=self.urlpath.path)
return redirect('wiki:settings', article_id=self.article.id)
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs['forms'] = self.forms kwargs['forms'] = self.forms
...@@ -226,10 +279,9 @@ def change_revision(request, article, revision_id=None, urlpath=None): ...@@ -226,10 +279,9 @@ def change_revision(request, article, revision_id=None, urlpath=None):
article.save() article.save()
messages.success(request, _(u'The article %s is now set to display revision #%d') % (revision.title, revision.revision_number)) messages.success(request, _(u'The article %s is now set to display revision #%d') % (revision.title, revision.revision_number))
if urlpath: if urlpath:
return redirect("wiki:history_url", urlpath.path) return redirect("wiki:history", path=urlpath.path)
else: else:
# TODO: Where to go if not a urlpath object? return redirect('wiki:history', article_id=article.id)
pass
# TODO: Throw in a class-based view # TODO: Throw in a class-based view
@get_article(can_read=True) @get_article(can_read=True)
...@@ -306,7 +358,9 @@ def merge(request, article, revision_id, urlpath=None, template_file="wiki/previ ...@@ -306,7 +358,9 @@ def merge(request, article, revision_id, urlpath=None, template_file="wiki/previ
{'r1': revision.revision_number, {'r1': revision.revision_number,
'r2': old_revision.revision_number}) 'r2': old_revision.revision_number})
if urlpath: if urlpath:
return redirect('wiki:edit_url', urlpath.path) return redirect('wiki:edit', path=urlpath.path)
else:
return redirect('wiki:edit', article_id=article.id)
c = RequestContext(request, {'article': article, c = RequestContext(request, {'article': article,
...@@ -319,6 +373,14 @@ def merge(request, article, revision_id, urlpath=None, template_file="wiki/previ ...@@ -319,6 +373,14 @@ def merge(request, article, revision_id, urlpath=None, template_file="wiki/previ
return render_to_response(template_file, c) return render_to_response(template_file, c)
def root_create(request): def root_create(request):
try:
root = models.URLPath.root()
if not root.article:
root.delete()
raise NoRootURL
return redirect('wiki:get', path=root.path)
except NoRootURL:
pass
if not request.user.has_perm('wiki.add_article'): if not request.user.has_perm('wiki.add_article'):
return redirect(reverse("wiki:login") + "?next=" + reverse("wiki:root_create")) return redirect(reverse("wiki:login") + "?next=" + reverse("wiki:root_create"))
if request.method == 'POST': if request.method == 'POST':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment