Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions wikipendium/wiki/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
default_app_config = 'wikipendium.wiki.apps.WikiConfig'
6 changes: 6 additions & 0 deletions wikipendium/wiki/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class WikiConfig(AppConfig):
name = 'wikipendium.wiki'
label = 'wikipendium__wiki'
6 changes: 3 additions & 3 deletions wikipendium/wiki/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ class Migration(migrations.Migration):
('title', models.CharField(max_length=1024)),
('lang', models.CharField(default=b'en', max_length=2)),
('updated', models.DateTimeField()),
('article', models.ForeignKey(to='wiki.Article')),
('child', models.ForeignKey(related_name='child_ac', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='wiki.ArticleContent', null=True)),
('article', models.ForeignKey(to='wikipendium__wiki.Article')),
('child', models.ForeignKey(related_name='child_ac', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='wikipendium__wiki.ArticleContent', null=True)),
('edited_by', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, blank=True, to=settings.AUTH_USER_MODEL, null=True)),
('parent', models.ForeignKey(related_name='parent_ac', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='wiki.ArticleContent', null=True)),
('parent', models.ForeignKey(related_name='parent_ac', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='wikipendium__wiki.ArticleContent', null=True)),
],
options={
},
Expand Down
2 changes: 1 addition & 1 deletion wikipendium/wiki/migrations/0002_article_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Migration(migrations.Migration):

dependencies = [
('taggit', '0001_initial'),
('wiki', '0001_initial'),
('wikipendium__wiki', '0001_initial'),
]

operations = [
Expand Down
24 changes: 24 additions & 0 deletions wikipendium/wiki/migrations/0003_auto_20160301_1703.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import migrations


def uppercase_all_article_slugs(apps, schema_editor):
Article = apps.get_model("wikipendium__wiki", "Article")
articles = Article.objects.all()
for article in articles:
if article.slug:
article.slug = article.slug.upper()
article.save()


class Migration(migrations.Migration):

dependencies = [
('wikipendium__wiki', '0002_article_tags'),
]

operations = [
migrations.RunPython(uppercase_all_article_slugs),
]
19 changes: 9 additions & 10 deletions wikipendium/wiki/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def add_tag_to_article(request, slug):
if not request.POST:
return HttpResponseBadRequest()

article = get_object_or_404(Article, slug=slug)
article = get_object_or_404(Article, slug=slug.upper())

if 'tag' not in request.POST:
return HttpResponseBadRequest()
Expand Down Expand Up @@ -163,7 +163,7 @@ def new(request, slug=None):
form = NewArticleForm(request.POST)
if form.is_valid():
slug = request.POST.get('slug')
article = Article(slug=slug)
article = Article(slug=slug.upper())
article.save()

article_content = form.save(commit=False)
Expand All @@ -174,9 +174,8 @@ def new(request, slug=None):
else:
article_content = None
if slug:
slug = slug.upper()
article_content = ArticleContent(article=Article(slug=slug),
lang=None)
article_content = ArticleContent(
article=Article(slug=slug.upper()), lang=None)
form = NewArticleForm(instance=article_content)

return render(request, 'edit.html', {
Expand All @@ -188,7 +187,7 @@ def new(request, slug=None):

@login_required
def add_language(request, slug, lang=None):
article = get_object_or_404(Article, slug=slug)
article = get_object_or_404(Article, slug=slug.upper())

if request.method == 'POST':
form = AddLanguageArticleForm(article, request.POST)
Expand All @@ -215,7 +214,7 @@ def add_language(request, slug, lang=None):

@login_required
def edit(request, slug, lang='en'):
article = get_object_or_404(Article, slug=slug)
article = get_object_or_404(Article, slug=slug.upper())
article_content = article.get_newest_content(lang)

if request.method == 'POST':
Expand Down Expand Up @@ -259,7 +258,7 @@ def preview(request):

def history(request, slug, lang='en'):
try:
article = Article.objects.get(slug=slug)
article = Article.objects.get(slug=slug.upper())
except:
return no_article(request, slug.upper())

Expand All @@ -276,7 +275,7 @@ def history(request, slug, lang='en'):

def history_single(request, slug, lang='en', id=None):
try:
article = Article.objects.get(slug=slug)
article = Article.objects.get(slug=slug.upper())
except:
return no_article(request, slug.upper())

Expand Down Expand Up @@ -306,7 +305,7 @@ def cacheable_history_single(request, ac, has_parent,

def history_single_rendered(request, slug, lang='en', id=None):
try:
Article.objects.get(slug=slug)
Article.objects.get(slug=slug.upper())
except:
return no_article(request, slug.upper())

Expand Down