Merge branch 'stable/1.4.x'

Conflicts:
	openslides/__init__.py

CHANGELOG

@@ -4,20 +4,38 @@
 
 http://openslides.org
 
-Version 1.4.2 (unreleased)
+Version 1.4.3 (unreleased)
 ==========================
 
 
+Version 1.4.2 (2013-09-10) 
+==========================
+[https://github.com/OpenSlides/OpenSlides/issues?milestone=12]
+
+- Used jQuery plugin bsmSelect for better <select multiple> form elements.
+- New config option to disable paragraph numbering in motion pdf. (Default value: disabled.)
+- Removed max value limitation in config field 'motion_min_supporters'.
+- Removed supporters signature field in motion pdf.
+- Fixed missing creation time of motion version. Show now string if identifier is not set (in widgets and motion detail).
+- Fixed error when a person is deleted.
+- Fixed deleting of assignments with related agenda items.
+- Fixed wrong ordering of agenda items after order change.
+- Fixed error in portable version: Open browser on localhost when server listens to 0.0.0.0.
+- Fixed typo and updated translations.
+- Updated CKEditor from 4.1.1 to 4.2. Fixed errors in MS Internet Explorer.
+- Updated to Django 1.5.2.
+
+
 Version 1.4.1 (2013-07-29)
 ==========================
 [https://github.com/OpenSlides/OpenSlides/issues?milestone=11]
 
-- Fix tooltip which shows the end of each agenda item.
+- Fixed tooltip which shows the end of each agenda item.
-- Fix duration of agenda with closed agenda items.
+- Fixed duration of agenda with closed agenda items.
-- Disable deleting active version of a motion.
+- Disabled deleting active version of a motion.
 - Start browser on custom IP address.
-- Fix wrong URLs to polls in motion detail view.
+- Fixed wrong URLs to polls in motion detail view.
-- Add Czech translation.
+- Added Czech translation.
 
 
 Version 1.4 (2013-07-10)

INSTALL.txt

@@ -1,5 +1,5 @@
 ================================================
- Installation instructions for OpenSlides 1.4.1
+ Installation instructions for OpenSlides 1.4.3
 ================================================
 
 Content

README.txt

@@ -2,7 +2,7 @@
  English README file for OpenSlides
 ====================================
 
-This is OpenSlides, version 1.4.2 (unreleased).
+This is OpenSlides, version 1.4.3 (unreleased).
 
 
 What is OpenSlides?

openslides/agenda/views.py

@@ -95,7 +95,6 @@ class Overview(TemplateView):
 
     @transaction.commit_manually
     def post(self, request, *args, **kwargs):
-        context = self.get_context_data(**kwargs)
         if not request.user.has_perm('agenda.can_manage_agenda'):
             messages.error(
                 request,
@@ -116,9 +115,11 @@ class Overview(TemplateView):
                 transaction.rollback()
                 messages.error(
                     request, _('Errors when reordering of the agenda'))
-                return self.render_to_response(context)
+                break
-        Item.objects.rebuild()
+        else:
+            Item.objects.rebuild()
         # TODO: assure, that it is a valid tree
+        context = self.get_context_data(**kwargs)
         transaction.commit()
         return self.render_to_response(context)
 

openslides/locale/cs/LC_MESSAGES/djangojs.po

@@ -5,15 +5,16 @@
 # Translators:
 # emanuel <emanuel@intevation.de>, 2013
 # emanuelschuetze <emanuelschuetze@gmail.com>, 2013
+# emanuelschuetze <emanuel.schuetze@intevation.de>, 2013
 # ostcar <mail@oshahn.de>, 2012
 # fri <pavelfric@seznam.cz>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenSlides\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-07 23:49+0200\n"
+"POT-Creation-Date: 2013-09-02 13:52+0200\n"
-"PO-Revision-Date: 2013-07-15 23:01+0000\n"
+"PO-Revision-Date: 2013-09-09 20:07+0000\n"
-"Last-Translator: fri <pavelfric@seznam.cz>\n"
+"Last-Translator: emanuelschuetze <emanuel.schuetze@intevation.de>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/openslides/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,7 +137,7 @@ msgid "Monday"
 msgstr "Pondělí"
 
 #: agenda/static/javascript/agenda-config-datepicker.js:25
-msgid "Tuesdey"
+msgid "Tuesday"
 msgstr "Úterý"
 
 #: agenda/static/javascript/agenda-config-datepicker.js:25

openslides/locale/de/LC_MESSAGES/djangojs.po

@@ -5,16 +5,17 @@
 # Translators:
 # emanuel <emanuel@intevation.de>, 2013
 # emanuel <emanuel@intevation.de>, 2013
-# emanuelschuetze <emanuelschuetze@gmail.com>, 2013
+# emanuelschuetze <emanuel.schuetze@intevation.de>, 2013
+# emanuelschuetze <emanuel.schuetze@intevation.de>, 2013
 # ostcar <mail@oshahn.de>, 2012
 # ostcar <mail@oshahn.de>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenSlides\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-07 23:49+0200\n"
+"POT-Creation-Date: 2013-09-02 13:52+0200\n"
-"PO-Revision-Date: 2013-06-28 09:47+0000\n"
+"PO-Revision-Date: 2013-09-09 20:05+0000\n"
-"Last-Translator: emanuelschuetze <emanuelschuetze@gmail.com>\n"
+"Last-Translator: emanuelschuetze <emanuel.schuetze@intevation.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/openslides/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -137,7 +138,7 @@ msgid "Monday"
 msgstr "Montag"
 
 #: agenda/static/javascript/agenda-config-datepicker.js:25
-msgid "Tuesdey"
+msgid "Tuesday"
 msgstr "Dienstag"
 
 #: agenda/static/javascript/agenda-config-datepicker.js:25

openslides/locale/fr/LC_MESSAGES/djangojs.po

@@ -3,7 +3,8 @@
 # Copyright (C) 2011–2013 by OpenSlides team, see AUTHORS.
 # This file is distributed under the same license as the OpenSlides package.
 # Translators:
-# emanuelschuetze <emanuelschuetze@gmail.com>, 2013
+# emanuelschuetze <emanuel.schuetze@intevation.de>, 2013
+# emanuelschuetze <emanuel.schuetze@intevation.de>, 2013
 # moosline <moosline@savvy.ch>, 2013
 # moosline <moosline@savvy.ch>, 2012-2013
 # moosline <moosline@savvy.ch>, 2012
@@ -11,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenSlides\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-07 23:49+0200\n"
+"POT-Creation-Date: 2013-09-02 13:52+0200\n"
-"PO-Revision-Date: 2013-06-28 09:48+0000\n"
+"PO-Revision-Date: 2013-09-09 20:08+0000\n"
-"Last-Translator: emanuelschuetze <emanuelschuetze@gmail.com>\n"
+"Last-Translator: emanuelschuetze <emanuel.schuetze@intevation.de>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/openslides/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,7 +137,7 @@ msgid "Monday"
 msgstr "Lundi"
 
 #: agenda/static/javascript/agenda-config-datepicker.js:25
-msgid "Tuesdey"
+msgid "Tuesday"
 msgstr "Mardi"
 
 #: agenda/static/javascript/agenda-config-datepicker.js:25

tests/agenda/tests.py

@@ -210,6 +210,25 @@ class ViewTest(TestCase):
         response = c.get('/agenda/%s/' % item.id)
         self.assertContains(response, 'quai5OTeephaequ0xei0')
 
+    def test_change_item_order(self):
+        data = {
+            'i1-self': 1,
+            'i1-weight': 50,
+            'i1-parent': 0,
+            'i2-self': 2,
+            'i2-weight': 50,
+            'i2-parent': 1}
+        response = self.adminClient.post('/agenda/', data)
+
+        # Test values in response.
+        items = response.context['items']
+        self.assertIsNone(items[0].parent)
+        self.assertEqual(items[1].parent_id, 1)
+
+        # Test values in DB
+        self.assertIsNone(Item.objects.get(pk=1).parent)
+        self.assertEqual(Item.objects.get(pk=2).parent_id, 1)
+
 
 class ConfigTest(TestCase):
     def setUp(self):