Merge pull request #2308 from learningequality/release-0.12.0

Release 0.12.5
learningequality · Aug 9, 2014 · aaf3b70 · aaf3b70
2 parents b6a44fb + 3c51270
commit aaf3b70
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/kalite/control_panel/templates/control_panel/facility_management.html b/kalite/control_panel/templates/control_panel/facility_management.html
@@ -363,11 +363,13 @@ <h2>{% trans "Students" %}&nbsp;<small>
                     <ul class="pagination pagination-sm">
                         <li><a title="{% trans 'Browse to the previous page of students.' %}" {% if student_pages.has_previous %}href="{{ page_urls.students.prev_page }}#students"{% endif %}>&laquo;</a></li>
                         {% for listed_page in student_pages.listed_pages %}
-                            <li {% if listed_page == student_pages.number %} class="active"><a disabled="disabled">{{student_pages.number}}</a>
-                                {% else %}>
-                                    <a title="{% blocktrans %}Browse to page # {{ listed_page }} of students.{% endblocktrans %}" href="{{ page_urls.students|get_item:listed_page }}#students">{{ listed_page }}</a>
-                                {% endif %}
-                            </li>
+                            {% if listed_page == -1 %}
+                            <li><a disabled="disabled">&hellip;</a></li>
+                            {% elif listed_page == student_pages.number %}
+                            <li class="active"><a disabled="disabled">{{student_pages.number}}</a></li>
+                            {% else %}
+                            <li><a title="{% blocktrans %}Browse to page # {{ listed_page }} of students.{% endblocktrans %}" href="{{ page_urls.students|get_item:listed_page }}#students">{{ listed_page }}</a></li>
+                            {% endif %}
                         {% endfor %}
                         <li><a title="{% trans 'Browse to the next page of students.' %}" {% if student_pages.has_next %}href="{{ page_urls.students.next_page }}#students"{% endif %}>&raquo;</a></li>
                     </ul>

diff --git a/kalite/version.py b/kalite/version.py
@@ -1,28 +1,45 @@
 # THIS IS USED BY settings.py.  NEVER import settings.py here; hard-codes only!
-# this is actually 0.12.2, but we need to update language pack version fallbacks before changing here
+# this is actually 0.12.5, but we need to update language pack version fallbacks before changing here
 VERSION = "0.12.0"
 VERSION_INFO = {
 
+    "0.12.5": {
+        "release_date": "2014/08/08",
+        "git_commit": "19055bb",
+        "new_features": {
+            "all": [],
+            "students": [],
+            "coaches": [],
+            "admins": [],
+        },
+        "bugs_fixed": {
+            "all": [],
+            "students": [],
+            "coaches": [],
+            "admins": ["Critical fix: ensure models created elsewhere sync after being modified"],
+        },
+    },
+
     "0.12.4": {
         "release_date": "2014/08/07",
-        "git_commit": "8c3c3",
+        "git_commit": "8c3c331",
         "new_features": {
             "all": [],
             "students": [],
             "coaches": [],
             "admins": [],
         },
         "bugs_fixed": {
-            "all": ["Run setup when database is not initialized on startup"],
+            "all": [],
             "students": ["Stop opening new tabs when opening related videos from exercises"],
             "coaches": [],
-            "admins": [],
+            "admins": ["Run setup when database is not initialized on startup"],
         },
     },
 
     "0.12.3": {
         "release_date": "2014/08/02",
-        "git_commit": "90f88",
+        "git_commit": "90f8880",
         "new_features": {
             "all": [],
             "students": ["Numpad for student exercises"],

diff --git a/python-packages/securesync/engine/__init__.py b/python-packages/securesync/engine/__init__.py
@@ -136,7 +136,7 @@ def get_models(device_counters=None, limit=None, zone=None, dest_version=None, *
 
             device = Device.all_objects.get(pk=device_id)
 
-            queryset = Model.all_objects.filter(Q(signed_by=device) | Q(signed_by__isnull=True))
+            queryset = Model.all_objects.filter(Q(signed_by=device) | Q(signed_by__isnull=True) | Q(counter__isnull=True))
 
             # for trusted (central) device, only include models with the correct fallback zone
             if not device.in_zone(zone):