1
=== added directory 'templates/admin'
2
=== added directory 'templates/admin/wiki'
3
=== added directory 'templates/admin/wiki/article'
4
=== added file 'templates/admin/wiki/article/change_form.html'
5
--- templates/admin/wiki/article/change_form.html	1970-01-01 00:00:00 +0000
6
+++ templates/admin/wiki/article/change_form.html	2017-01-18 20:19:31 +0000
7
@@ -0,0 +1,9 @@
8
1
{% extends "admin/change_form.html" %}
9
2
{% load i18n admin_urls %}
10
3
11
4
{% block object-tools-items %}
12
5
    <li>
13
6
        <a href="/admin/wiki/changeset/?article__title={{ original.title }}" class="historylink">{% trans "Changesets" %}</a>
14
7
    </li>
15
8
    {% if has_absolute_url %}<li><a href="{{ absolute_url }}" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif %}
16
9
{% endblock %}
17
0
10
18
=== added file 'templates/wiki/backlinks.html'
19
--- templates/wiki/backlinks.html	1970-01-01 00:00:00 +0000
20
+++ templates/wiki/backlinks.html	2017-01-18 20:19:31 +0000
21
@@ -0,0 +1,38 @@
22
1
{% extends 'wiki/base.html' %}
23
2
{% load wiki_extras %}
24
3
{% load i18n %}
25
4
{% block title %}
26
5
{{ name }} - Backlinks - {{block.super}}
27
6
{% endblock %}
28
7
29
8
{% block content %}
30
9
<div class="posRight small">
31
10
	<a class="invertedColor" href="{% url 'wiki_article' name %}">Back to article</a>
32
11
</div>
33
12
<h1>{% trans "Backlinks of " %} {{ name }}</h1>
34
13
<div class="blogEntry">
35
14
	{% if found_links or found_old_links %}
36
15
		{% if found_links %}
37
16
		<h3>The following pages have link(s) which point to this article:</h3>
38
17
		<ul>
39
18
		{% for article in found_links %}
40
19
				<li><a href="{% url 'wiki_article' article.title %}">{{ article.title }}</a></li>
41
20
		{% endfor %}
42
21
		</ul>
43
22
		{% endif %}
44
23
		{% if found_old_links %}
45
24
		<h3>The following articles have links which point to one of the old name(s) of this article (redirects):</h3>
46
25
		<ul>
47
26
		{% for article in found_old_links %}
48
27
			<li><a href="{% url 'wiki_article' article.title %}">{{ article.title }}</a>
49
28
			(has at least one link to: "{{ article.old_title }}")</li>
50
29
		{% endfor %}
51
30
		</ul>
52
31
		{% endif %}
53
32
	{% else %}
54
33
		<p><span class="errormessage">Every Wikipage must be linked from at least one another page.</span>
55
34
		Please link it <img src="/wlmedia/img/smileys/face-smile.png" alt="face-smile.png"> See <a href="/wiki/WikiSyntax/#links">Wiki Syntax</a> for help.</p></p>
56
35
	{% endif %}
57
36
</div>
58
37
{% endblock %}
59
38
60
0
39
61
=== modified file 'templates/wiki/edit.html'
62
--- templates/wiki/edit.html	2016-11-26 20:55:21 +0000
63
+++ templates/wiki/edit.html	2017-01-18 20:19:31 +0000
64
@@ -60,17 +60,17 @@
65
60
			<!-- Title -->
60
			<!-- Title -->
66
61
			<tr>
61
			<tr>
67
62
				<th><label for="id_title">{% trans "Title" %}:</label></th>
62
				<th><label for="id_title">{% trans "Title" %}:</label></th>
69
63
				<td>{{ form.title.errors }}{{ form.title }}</td>
63
				<td class="errormessage">{{ form.title.errors }}{{ form.title }}</td>
70
64
			</tr>
64
			</tr>
71
65
			<!-- Content -->
65
			<!-- Content -->
72
66
			<tr><th colspan="2"><label for="id_content">{% trans "Content" %}:</label></th></tr>
66
			<tr><th colspan="2"><label for="id_content">{% trans "Content" %}:</label></th></tr>
74
67
			<tr><td colspan="2" >{{ form.content.errors }}{{ form.content }}</td></tr>
67
			<tr><td colspan="2"  class="errormessage">{{ form.content.errors }}{{ form.content }}</td></tr>
75
68
			<!-- Summary -->
68
			<!-- Summary -->
76
69
			<tr><th colspan="2"><label for="id_summary">{% trans "Page Summary" %}:</label></th></tr>
69
			<tr><th colspan="2"><label for="id_summary">{% trans "Page Summary" %}:</label></th></tr>
78
70
			<tr><td colspan="2" >{{ form.summary.errors }}{{ form.summary }}</td></tr>
70
			<tr><td colspan="2"  class="errormessage">{{ form.summary.errors }}{{ form.summary }}</td></tr>
79
71
			<!-- Comment -->
71
			<!-- Comment -->
80
72
			<tr><th colspan=2><label for="id_comment">{% trans "Comment for this revision" %}:</label></th></tr>
72
			<tr><th colspan=2><label for="id_comment">{% trans "Comment for this revision" %}:</label></th></tr>
82
73
			<tr><td colspan=2 >{{ form.comment.errors }}{{ form.comment }}</td></tr>
73
			<tr><td colspan=2  class="errormessage">{{ form.comment.errors }}{{ form.comment }}</td></tr>
83
74
		</table>
74
		</table>
84
75
		<!-- Markup as hidden element -->
75
		<!-- Markup as hidden element -->
85
76
		<input type="hidden" name="markup" value="mrk" />
76
		<input type="hidden" name="markup" value="mrk" />
86
77
77
87
=== modified file 'templates/wiki/view.html'
88
--- templates/wiki/view.html	2016-04-26 16:10:04 +0000
89
+++ templates/wiki/view.html	2017-01-18 20:19:31 +0000
90
@@ -18,6 +18,8 @@
91
18
		<a class="invertedColor" href="{% url 'wiki_edit' article.title %}">{% trans "Edit this article" %}</a>
18
		<a class="invertedColor" href="{% url 'wiki_edit' article.title %}">{% trans "Edit this article" %}</a>
92
19
		|
19
		|
93
20
		<a class="invertedColor" href="{% url 'wiki_article_history' article.title %}">{% trans "Editing history" %}</a>
20
		<a class="invertedColor" href="{% url 'wiki_article_history' article.title %}">{% trans "Editing history" %}</a>
94
21
		|
95
22
		<a class="invertedColor" href="{% url 'backlinks' article.title %}">{% trans "Backlinks" %}</a>
96
21
		{% if can_observe %}
23
		{% if can_observe %}
97
22
			| 
24
			| 
98
23
			{% if is_observing %} 
25
			{% if is_observing %} 
99
@@ -29,6 +31,13 @@
100
29
	{% endif %}
31
	{% endif %}
101
30
</div>
32
</div>
102
31
<h1>{{ article.title }}</h1>
33
<h1>{{ article.title }}</h1>
103
34
104
35
	{% if messages %}
105
36
	    {% for message in messages %}
106
37
	    <p class="errormessage">{{ message }}</p>
107
38
	    {% endfor %}
108
39
	{% endif %}
109
40
110
32
<div class="blogEntry">
41
<div class="blogEntry">
111
33
	{% if not article.id %}
42
	{% if not article.id %}
112
34
		<p>
43
		<p>
113
35
44
114
=== modified file 'wiki/admin.py'
115
--- wiki/admin.py	2016-11-22 22:17:23 +0000
116
+++ wiki/admin.py	2017-01-18 20:19:31 +0000
117
@@ -15,7 +15,7 @@
118
15
15
119
16
class ArticleAdmin(admin.ModelAdmin):
16
class ArticleAdmin(admin.ModelAdmin):
120
17
    search_fields = ['title']
17
    search_fields = ['title']
122
18
    list_display = ('title', 'markup', 'created_at', 'last_update',)
18
    list_display = ('title', 'creator', 'last_update',)
123
19
    list_filter = ('title',)
19
    list_filter = ('title',)
124
20
    ordering = ['-last_update']
20
    ordering = ['-last_update']
125
21
    fieldsets = (
21
    fieldsets = (
126
@@ -32,11 +32,11 @@
127
32
32
128
33
33
129
34
class ChangeSetAdmin(admin.ModelAdmin):
34
class ChangeSetAdmin(admin.ModelAdmin):
133
35
    search_fields = ['article__title']
35
    search_fields = ['old_title']
134
36
    list_display = ('article', 'revision', 'old_title', 'old_markup',
36
    list_display = ('article', 'old_title', 'old_markup',
135
37
                    'editor', 'editor_ip', 'reverted', 'modified',
37
                    'editor', 'reverted', 'modified',
136
38
                    'comment')
38
                    'comment')
138
39
    list_filter = ('old_title', 'content_diff')
39
    list_filter = ('article__title',)
139
40
    ordering = ('-modified',)
40
    ordering = ('-modified',)
140
41
    fieldsets = (
41
    fieldsets = (
141
42
        ('Article', {'fields': ('article',)}),
42
        ('Article', {'fields': ('article',)}),
142
43
43
143
=== modified file 'wiki/forms.py'
144
--- wiki/forms.py	2016-12-13 18:28:51 +0000
145
+++ wiki/forms.py	2017-01-18 20:19:31 +0000
146
@@ -2,11 +2,11 @@
147
2
import re
2
import re
148
3
3
149
4
from django import forms
4
from django import forms
150
5
from django.forms import widgets
151
6
from django.contrib.contenttypes.models import ContentType
5
from django.contrib.contenttypes.models import ContentType
152
7
from django.utils.translation import ugettext_lazy as _
6
from django.utils.translation import ugettext_lazy as _
153
8
7
154
9
from wiki.models import Article
8
from wiki.models import Article
155
9
from wiki.models import ChangeSet
156
10
from wiki.templatetags.wiki_extras import WIKI_WORD_RE
10
from wiki.templatetags.wiki_extras import WIKI_WORD_RE
157
11
11
158
12
wikiword_pattern = re.compile('^' + WIKI_WORD_RE + '$')
12
wikiword_pattern = re.compile('^' + WIKI_WORD_RE + '$')
159
@@ -34,11 +34,31 @@
160
34
                   'group', 'created_at', 'last_update')
34
                   'group', 'created_at', 'last_update')
161
35
35
162
36
    def clean_title(self):
36
    def clean_title(self):
164
37
        """Page title must be a WikiWord."""
37
        """Check for some errors regarding the title:
165
38
166
39
        1. Check for bad characters
167
40
        2. Check for already used titles
168
41
169
42
        Immediately trying to change the title of a new article to an existing title
170
43
        is handled on the database level.
171
44
172
45
        """
173
46
174
38
        title = self.cleaned_data['title']
47
        title = self.cleaned_data['title']
175
39
        if not wikiword_pattern.match(title):
48
        if not wikiword_pattern.match(title):
178
40
            raise forms.ValidationError(_('Must be a WikiWord.'))
49
            raise forms.ValidationError(
179
41
50
                _('Only alphanumeric characters, blank spaces and the underscore are allowed in a title.'))
180
51
181
52
        # 'self.initial' contains the prefilled values of the form
182
53
        pre_title = self.initial.get('title', None)
183
54
        if pre_title != title or not pre_title:
184
55
            # Check if the new name has been used already
185
56
            cs = ChangeSet.objects.filter(old_title=title)
186
57
            if cs:
187
58
                raise forms.ValidationError(
188
59
                    _('The title %(title)s is already in use, maybe an other article used to have this name.'), params={'title': title},)
189
60
190
61
        # title not changed, no errors
191
42
        return title
62
        return title
192
43
63
193
44
    def clean(self):
64
    def clean(self):
194
@@ -52,10 +72,6 @@
195
52
                kw['object_id'] = self.cleaned_data['object_id']
72
                kw['object_id'] = self.cleaned_data['object_id']
196
53
            except KeyError:
73
            except KeyError:
197
54
                pass  # some error in this fields
74
                pass  # some error in this fields
198
55
            else:
199
56
                if Article.objects.filter(**kw).count():
200
57
                    raise forms.ValidationError(
201
58
                        _('An article with this title already exists.'))
202
59
75
203
60
        return self.cleaned_data
76
        return self.cleaned_data
204
61
77
205
62
78
206
=== added file 'wiki/migrations/0002_auto_20161218_1056.py'
207
--- wiki/migrations/0002_auto_20161218_1056.py	1970-01-01 00:00:00 +0000
208
+++ wiki/migrations/0002_auto_20161218_1056.py	2017-01-18 20:19:31 +0000
209
@@ -0,0 +1,19 @@
210
1
# -*- coding: utf-8 -*-
211
2
from __future__ import unicode_literals
212
3
213
4
from django.db import models, migrations
214
5
215
6
216
7
class Migration(migrations.Migration):
217
8
218
9
    dependencies = [
219
10
        ('wiki', '0001_initial'),
220
11
    ]
221
12
222
13
    operations = [
223
14
        migrations.AlterField(
224
15
            model_name='article',
225
16
            name='title',
226
17
            field=models.CharField(unique=True, max_length=50, verbose_name='Title'),
227
18
        ),
228
19
    ]
229
0
20
230
=== modified file 'wiki/models.py'
231
--- wiki/models.py	2016-12-13 18:28:51 +0000
232
+++ wiki/models.py	2017-01-18 20:19:31 +0000
233
@@ -48,8 +48,8 @@
234
48
48
235
49
49
236
50
class Article(models.Model):
50
class Article(models.Model):
239
51
    """A wiki page."""
51
    """A wiki page reflecting the actual revision."""
240
52
    title = models.CharField(_(u"Title"), max_length=50)
52
    title = models.CharField(_(u"Title"), max_length=50, unique=True)
241
53
    content = models.TextField(_(u"Content"))
53
    content = models.TextField(_(u"Content"))
242
54
    summary = models.CharField(_(u"Summary"), max_length=150,
54
    summary = models.CharField(_(u"Summary"), max_length=150,
243
55
                               null=True, blank=True)
55
                               null=True, blank=True)
244
56
56
245
=== modified file 'wiki/urls.py'
246
--- wiki/urls.py	2016-12-13 18:28:51 +0000
247
+++ wiki/urls.py	2017-01-18 20:19:31 +0000
248
@@ -56,4 +56,7 @@
249
56
56
250
57
    url(r'^history/(?P<title>' + WIKI_URL_RE + r')/revert/$', views.revert_to_revision,
57
    url(r'^history/(?P<title>' + WIKI_URL_RE + r')/revert/$', views.revert_to_revision,
251
58
        name='wiki_revert_to_revision'),
58
        name='wiki_revert_to_revision'),
252
59
253
60
    url(r'^backlinks/(?P<title>' + WIKI_URL_RE + r')/$', views.backlinks,
254
61
        name='backlinks'),
255
59
]
62
]
256
60
63
257
=== modified file 'wiki/views.py'
258
--- wiki/views.py	2016-12-13 18:28:51 +0000
259
+++ wiki/views.py	2017-01-18 20:19:31 +0000
260
@@ -10,7 +10,7 @@
261
10
                         HttpResponseNotAllowed, HttpResponse, HttpResponseForbidden)
10
                         HttpResponseNotAllowed, HttpResponse, HttpResponseForbidden)
262
11
from django.shortcuts import get_object_or_404, render_to_response, redirect
11
from django.shortcuts import get_object_or_404, render_to_response, redirect
263
12
from django.contrib.contenttypes.models import ContentType
12
from django.contrib.contenttypes.models import ContentType
265
13
13
from django.contrib import messages
266
14
from wiki.forms import ArticleForm
14
from wiki.forms import ArticleForm
267
15
from wiki.models import Article, ChangeSet, dmp
15
from wiki.models import Article, ChangeSet, dmp
268
16
16
269
@@ -19,6 +19,7 @@
270
19
from mainpage.templatetags.wl_markdown import do_wl_markdown
19
from mainpage.templatetags.wl_markdown import do_wl_markdown
271
20
20
272
21
from wl_utils import get_real_ip
21
from wl_utils import get_real_ip
273
22
import re
274
22
23
275
23
# Settings
24
# Settings
276
24
#  lock duration in minutes
25
#  lock duration in minutes
277
@@ -260,29 +261,26 @@
278
260
        return HttpResponseForbidden()
261
        return HttpResponseForbidden()
279
261
262
280
262
    try:
263
    try:
281
264
        # Try to fetch an existing article
282
263
        article = article_qs.get(**article_args)
265
        article = article_qs.get(**article_args)
283
264
    except ArticleClass.DoesNotExist:
266
    except ArticleClass.DoesNotExist:
285
265
        article = None
267
        # No article found, maybe we have a redirect
286
268
        try:
287
269
            cs = ChangeSet.objects.filter(old_title=title)[0]
288
270
            article = article_qs.get(title=cs.article)
289
271
        except IndexError:
290
272
            # No Article found and no redirect found
291
273
            article = None
292
266
274
293
267
    if request.method == 'POST':
275
    if request.method == 'POST':
294
268
276
295
269
        form = ArticleFormClass(request.POST, instance=article)
277
        form = ArticleFormClass(request.POST, instance=article)
297
270
278
        
298
271
        form.cache_old_content()
279
        form.cache_old_content()
299
272
        if form.is_valid():
280
        if form.is_valid():
300
273
281
301
274
            # NOCOMM Franku: This has never worked as i know and is IMHO
302
275
            # useless. This code works with django 1.8 but misses some code
303
276
            # in template. See
304
277
            # https://docs.djangoproject.com/en/1.8/ref/contrib/messages/#module-django.contrib.messages
305
278
306
279
            if request.user.is_authenticated():
282
            if request.user.is_authenticated():
307
280
                form.editor = request.user
283
                form.editor = request.user
308
281
            #     if article is None:
309
282
            #         user_message = u"Your article was created successfully."
310
283
            #     else:
311
284
            #         user_message = u"Your article was edited successfully."
312
285
            #     messages.success(request, user_message)
313
286
284
314
287
            if ((article is None) and (group_slug is not None)):
285
            if ((article is None) and (group_slug is not None)):
315
288
                form.group = group
286
                form.group = group
316
@@ -478,18 +476,23 @@
317
478
476
318
479
        article = get_object_or_404(article_qs, **article_args)
477
        article = get_object_or_404(article_qs, **article_args)
319
480
478
332
481
        if request.user.is_authenticated():
479
        
333
482
            article.revert_to(revision, get_real_ip(request), request.user)
480
        # Check whether there is another Article with the same name to which this article
334
483
        else:
481
        # wants to be reverted to. If so: prevent it and show a message.
335
484
            article.revert_to(revision, get_real_ip(request))
482
        old_title = article.changeset_set.filter(
336
485
483
            revision=revision+1).get().old_title
337
486
        # NOCOMM Franku: This has never worked as i know and is IMHO
484
        try:
338
487
        # useless. If we want this it has to be fixed for django 1.8
485
            art = Article.objects.exclude(pk=article.pk).get(title=old_title)
339
488
        # See comment in edit_article()
486
        except Article.DoesNotExist:
340
489
        # if request.user.is_authenticated():
487
            # No existing article found -> reverting possible
341
490
        #     request.user.message_set.create(
488
            if request.user.is_authenticated():
342
491
        #         message=u"The article was reverted successfully.")
489
                article.revert_to(revision, get_real_ip(request), request.user)
343
492
490
            else:
344
491
                article.revert_to(revision, get_real_ip(request))
345
492
            return redirect(article)
346
493
        # An article with this name exists
347
494
        messages.error(
348
495
            request, 'Reverting not possible because an article with name \'%s\' already exists' % old_title)
349
493
        return redirect(article)
496
        return redirect(article)
350
494
497
351
495
    return HttpResponseNotAllowed(['POST'])
498
    return HttpResponseNotAllowed(['POST'])
352
@@ -622,3 +625,50 @@
353
622
    dmp.diff_cleanupSemantic(diffs)
625
    dmp.diff_cleanupSemantic(diffs)
354
623
626
355
624
    return HttpResponse(dmp.diff_prettyHtml(diffs), content_type='text/html')
627
    return HttpResponse(dmp.diff_prettyHtml(diffs), content_type='text/html')
356
628
357
629
358
630
def backlinks(request, title):
359
631
    """Simple text search for links in other wiki articles pointing to the
360
632
    current article.
361
633
362
634
    If we convert WikiWords to markdown wikilinks syntax, this view
363
635
    should be changed to use '[[title]]' for searching.
364
636
365
637
    """
366
638
367
639
    # Find old title(s) of this article
368
640
    this_article = Article.objects.get(title=title)
369
641
    changesets = this_article.changeset_set.all()
370
642
    old_titles = []
371
643
    for cs in changesets:
372
644
        if cs.old_title and cs.old_title != title and cs.old_title not in old_titles:
373
645
            old_titles.append(cs.old_title)
374
646
375
647
    # Differentiate between WikiWords and other
376
648
    m = re.match(r"(!?)(\b[A-Z][a-z]+[A-Z]\w+\b)", title)
377
649
    if m:
378
650
        # title is a 'WikiWord' -> This catches also 'MingW' but we have no such title
379
651
        search_title = re.compile(r"%s" % title)
380
652
    else:
381
653
        # Others must be written like links: '[Wiki Page](/wiki/Wiki Page)'
382
654
        search_title = re.compile(r"\/%s\)" % title)
383
655
    
384
656
    # Search for current and previous titles
385
657
    found_old_links = []
386
658
    found_links = []
387
659
    articles_all = Article.objects.all().exclude(title=title)
388
660
    for article in articles_all:
389
661
        match = search_title.search(article.content)
390
662
        if match:
391
663
            found_links.append({'title': article.title})
392
664
        
393
665
        for old_title in old_titles:
394
666
            if old_title in article.content:
395
667
                found_old_links.append({'old_title': old_title, 'title': article.title })
396
668
397
669
    context = {'found_links': found_links,
398
670
               'found_old_links': found_old_links,
399
671
               'name': title}
400
672
    return render_to_response('wiki/backlinks.html',
401
673
                              context,
402
674
                              context_instance=RequestContext(request))
Reviewer	Review Type	Date Requested	Status
SirVer	code	2017-01-03	Approve on 2017-01-13
Review via email: mp+314033@code.launchpad.net