Patch to fix earlier failed merges. See localwiki#293

docs/html/_sources/permissions.txt

@@ -66,6 +66,13 @@ Click on the username, and scroll down "Groups" section. Hold down
 
 .. figure:: /_static/images/admin_ban_user.png
 
+.. note::
+
+   While it's possible in the admin interface to delete a user, this is
+   **NOT** recommended as it will also delete every change the user has made.
+   If you need to disable a user's account, it's best to just unmark the
+   "active" checkbox for that user.
+
 
 Setting permissions for specific objects
 ----------------------------------------

docs/html/permissions.html

@@ -103,6 +103,13 @@ <h2>Banning a user<a class="headerlink" href="#banning-a-user" title="Permalink
 <div class="figure">
 <img alt="_images/admin_ban_user.png" src="_images/admin_ban_user.png" />
 </div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">While it&#8217;s possible in the admin interface to delete a user, this is
+<strong>NOT</strong> recommended as it will also delete every change the user has made.
+If you need to disable a user&#8217;s account, it&#8217;s best to just unmark the
+&#8220;active&#8221; checkbox for that user.</p>
+</div>
 </div>
 <div class="section" id="setting-permissions-for-specific-objects">
 <h2>Setting permissions for specific objects<a class="headerlink" href="#setting-permissions-for-specific-objects" title="Permalink to this headline">¶</a></h2>

docs/source/permissions.rst

@@ -66,6 +66,13 @@ Click on the username, and scroll down "Groups" section. Hold down
 
 .. figure:: /_static/images/admin_ban_user.png
 
+.. note::
+
+   While it's possible in the admin interface to delete a user, this is
+   **NOT** recommended as it will also delete every change the user has made.
+   If you need to disable a user's account, it's best to just unmark the
+   "active" checkbox for that user.
+
 
 Setting permissions for specific objects
 ----------------------------------------

sapling/locale/pt_PT/LC_MESSAGES/django.po

@@ -418,6 +418,30 @@ msgstr "Comentário"
 msgid "Page renamed to \"%s\""
 msgstr "Nome da Página alterado para \"%s\""
 
+#: pages/widgets.py:27
+msgid "Normal"
+msgstr "Normal"
+
+#: pages/widgets.py:28
+msgid "Heading 1"
+msgstr "Cabeçalho 1"
+
+#: pages/widgets.py:29
+msgid "Heading 2"
+msgstr "Cabeçalho 2"
+
+#: pages/widgets.py:30
+msgid "Heading 3"
+msgstr "Cabeçalho 3"
+
+#: pages/widgets.py:31
+msgid "Formatted"
+msgstr "Cabeçalho 4"
+
+#: pages/widgets.py:32
+msgid "Typewriter"
+msgstr "Máquina de Escrever"
+
 #: pages/templates/pages/base.html:5
 msgid "Recent changes on this Page"
 msgstr "Alterações recentes nesta Paǵina"

sapling/pages/static/js/ckeditor/_source/plugins/includepage/dialogs/includepage.js

@@ -149,7 +149,7 @@ CKEDITOR.dialog.add( 'includepage', function( editor )
 			var editor = this.getParentEditor(),
 				selection = editor.getSelection(),
 				element = null,
-				data = { page : '' };
+				data = { page : '', showtitle : true };
 
 			// Fill in all the relevant fields if there's already one link selected.
 			if ( ( element = pagelink_plugin.getSelectedLink( editor ) )
@@ -163,6 +163,7 @@ CKEDITOR.dialog.add( 'includepage', function( editor )
 				data.page = decodeURIComponent(element.getAttribute( 'href' ));
 				if(element.hasClass('includepage_showtitle'))
 					data.showtitle = true;
+				else data.showtitle = false;
 				if(element.hasClass('includepage_left'))
 					data.align = 'left';
 				if(element.hasClass('includepage_right'))

sapling/pages/widgets.py

@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.utils.translation import ugettext as _
 
 from utils.static import static_url
 from utils import reverse_lazy
@@ -23,12 +24,12 @@ def get_config(self):
             'disableNativeSpellChecker': False,
             'browserContextMenuOnCtrl': True,
             'enterMode': 1,
-            'stylesSet': [{'name': 'Normal', 'element': 'p'},
-                          {'name': 'Heading 1', 'element': 'h1'},
-                          {'name': 'Heading 2', 'element': 'h2'},
-                          {'name': 'Heading 3', 'element': 'h3'},
-                          {'name': 'Formatted', 'element': 'pre'},
-                          {'name': 'Typewriter', 'element': 'tt'}
+            'stylesSet': [{'name': _('Normal'), 'element': 'p'},
+                          {'name': _('Heading 1'), 'element': 'h1'},
+                          {'name': _('Heading 2'), 'element': 'h2'},
+                          {'name': _('Heading 3'), 'element': 'h3'},
+                          {'name': _('Formatted'), 'element': 'pre'},
+                          {'name': _('Typewriter'), 'element': 'tt'}
                         ],
             'indentClasses': ['indent1', 'indent2', 'indent3', 'indent4',
                               'indent5', 'indent6', 'indent7', 'indent8',

sapling/redirects/middleware.py

@@ -10,7 +10,7 @@ def _is_redirect(response):
 
 
 def _force_show_page(response):
-    return 'force_show' in response.GET
+    return 'show' in response.GET
 
 
 class RedirectFallbackMiddleware(object):

sapling/tags/admin.py

@@ -0,0 +1,10 @@
+from django.contrib import admin
+from guardian.admin import GuardedModelAdmin
+
+from models import Tag
+
+
+class TagAdmin(GuardedModelAdmin):
+    pass
+
+admin.site.register(Tag, TagAdmin)

sapling/tags/templates/tags/pagetagset_form.html

@@ -1,6 +1,10 @@
 {% extends "tags/base.html" %}
 {% load i18n %}
 
+{% block search_robots %}
+<meta name="robots" content="noindex,nofollow">
+{% endblock %}
+
 {% block media %}
   {{ block.super }}
   {{ form.media }}

sapling/tags/views.py

@@ -1,24 +1,24 @@
 import copy
-
 from dateutil.parser import parse as dateparser
 
-from utils.views import CreateObjectMixin, PermissionRequiredMixin,\
-    Custom404Mixin
-from tags.models import PageTagSet, Tag, slugify
-from tags.forms import PageTagSetForm
-from pages.models import Page
 from django.core.urlresolvers import reverse
 from django.views.generic.list import ListView
 from django.http import HttpResponse, HttpResponseRedirect
-from versionutils.versioning.views import VersionsList, RevertView, UpdateView
 from django.views.generic.detail import DetailView
-from versionutils.diff.views import CompareView
-from maps.views import MapForTag
-from maps.widgets import InfoMap
 from django.conf import settings
 from django.shortcuts import get_object_or_404
 from django.db.models.aggregates import Count
 
+from versionutils.versioning.views import VersionsList, RevertView, UpdateView
+from versionutils.diff.views import CompareView
+from utils.views import CreateObjectMixin, PermissionRequiredMixin,\
+    Custom404Mixin
+from tags.models import PageTagSet, Tag, slugify
+from tags.forms import PageTagSetForm
+from pages.models import Page
+from maps.views import MapForTag
+from maps.widgets import InfoMap
+
 
 class PageNotFoundMixin(Custom404Mixin):
     def handler404(self, request, *args, **kwargs):

sapling/themes/sapling/assets/css/site.css

@@ -899,6 +899,7 @@ div.templates li {
 
 .see_also {
     margin-top: 2em;
+    clear: both;
 }
 /*
 ====================================

sapling/versionutils/versioning/history_model_methods.py

@@ -291,8 +291,13 @@ def _cascade_revert(current_hm, m, **kws):
         for rel_hm in rel_hms:
             direct_obj = rel_hm.version_info._object
             latest_rel_hm = get_versions(direct_obj).most_recent()
-            if latest_rel_hm.version_info.type in [TYPE_DELETED_CASCADE,
-                    TYPE_REVERTED_DELETED_CASCADE]:
+            latest_direct_obj = latest_rel_hm.version_info._object
+            deleted_is_same_as_latest = latest_direct_obj.pk == direct_obj.pk
+            # Was the related object most recently deleted via a delete cascade?
+            # Was the related object also most recently deleted TODO
+            if (latest_rel_hm.version_info.type in [TYPE_DELETED_CASCADE,
+                    TYPE_REVERTED_DELETED_CASCADE] and
+                deleted_is_same_as_latest):
                 # The related object was most recently deleted via a
                 # delete cascade.  So we revert it.
 

sapling/versionutils/versioning/tests/tests.py

@@ -552,6 +552,33 @@ def test_revert_fk_behavior(self):
         self.assertEquals(len(MUniqueAndFK.objects.filter(a="my name3a")), 1)
 
         # Case 3(b):
+        #   A model (M) with an FK to another versioned model (N).
+        #   Model N is deleted, which causes Model M to be deleted via
+        #   cascade.  Model M is re-created and its FK is pointed to a
+        #   different instance of model N.  This new instance is deleted,
+        #   causing model M to be deleted via cascade.  When reverting
+        #   model N, M should not be re-created because it wasn't
+        #   deleted via the same cascade.
+
+        n = M16Unique(a="wee", b="dog", c=1)
+        n.save()
+        m = MUniqueAndFK(a="me me me", b="cat", c=n)
+        m.save()
+
+        n.delete()  # Will cause m to be deleted via cascade.
+
+        n = M16Unique(a="new n wee", b="dog", c=1)
+        n.save()
+        m = MUniqueAndFK(a="me me me", b="cat", c=n)
+        m.save()
+
+        n.delete()  # Will cause m to be deleted via cascade.
+        n = M16Unique(a="wee", b="dog", c=1)
+        n.versions.as_of(version=1).revert_to()
+
+        self.assertEquals(len(MUniqueAndFK.objects.filter(a="wee")), 0)
+
+        # Case 3(c):
         #   A model (L) with an FK to another versioned model (M) with
         #   an FK to another versioned model (N).
         #   Model N is deleted, which causes models L, M to be deleted via
@@ -572,7 +599,7 @@ def test_revert_fk_behavior(self):
         l.b += "!"
         l.save()
 
-        n.delete() # Will cause m, l to be deleted via cascade.
+        n.delete()  # Will cause m, l to be deleted via cascade.
         n.versions.as_of(version=1).revert_to()
 
         self.assertEquals(len(MUniqueAndFK2.objects.filter(a="oh name3b")), 1)