Merge branch 'release-0.12.0'

Author: aronasorman

kalite/distributed/management/commands/kaserve.py

@@ -70,30 +70,13 @@ class Command(BaseCommand):
     def setup_server_if_needed(self):
         """Run the setup command, if necessary."""
 
-        # Now, validate the server.
-        try:
-            if Settings.get("private_key") and Device.objects.count():
-                # The only success case
-                pass
-
-            elif not Device.objects.count():
-                # Nothing we can do to recover
-                raise CommandError("You are screwed, buddy--you went through setup but you have no devices defined!  Call for help!")
-
-            else:
-                # Force hitting recovery code, by raising a generic error
-                #   that gets us to the "except" clause
-                raise DatabaseError
-
-        except DatabaseError:
+        try: # Ensure that the database has been synced and a Device has been created
+            assert Settings.get("private_key") and Device.objects.count()
+        except (DatabaseError, AssertionError): # Otherwise, run the setup command
             self.stdout.write("Setting up KA Lite; this may take a few minutes; please wait!\n")
-
-            call_command("setup", interactive=False)  # show output to the user
-            #out = call_command_with_output("setup", interactive=False)
-            #if out[1] or out[2]:
-            #    # Failed; report and exit
-            #    self.stderr.write(out[1])
-            #    raise CommandError("Failed to setup/recover.")
+            call_command("setup", interactive=False)
+        # Double check that the setup process successfully created a Device
+        assert Settings.get("private_key") and Device.objects.count(), "There was an error configuring the server. Please report the output of this command to Learning Equality."
 
     def reinitialize_server(self):
         """Reset the server state."""

kalite/distributed/management/commands/setup.py

@@ -26,13 +26,14 @@
 from django.core.management.base import BaseCommand, CommandError
 
 import kalite
+from fle_utils.config.models import Settings
 from fle_utils.general import get_host_name
 from fle_utils.internet import get_ip_addresses
 from fle_utils.platforms import is_windows, system_script_extension
 from kalite.version import VERSION
 from kalite.facility.models import Facility
 from securesync.management.commands.initdevice import load_data_for_offline_install, confirm_or_generate_zone, Command as InitCommand
-from securesync.models import Zone
+from securesync.models import Zone, Device
 
 
 def raw_input_yn(prompt):
@@ -204,7 +205,7 @@ def handle(self, *args, **options):
 
         if not install_clean and not database_file and not kalite.is_installed():
             # Make sure that, for non-sqlite installs, the database exists.
-            raise Exception("For databases not using SQLIte, you must set up your database before running setup.")
+            raise Exception("For databases not using SQLite, you must set up your database before running setup.")
 
         # Do all input at once, at the beginning
         if install_clean and options["interactive"]:
@@ -246,13 +247,21 @@ def handle(self, *args, **options):
         call_command("syncdb", interactive=False, verbosity=options.get("verbosity"))
         call_command("migrate", merge=True, verbosity=options.get("verbosity"))
 
-        # Install data
-        if install_clean:
-            # Create device, load on any zone data
+        # Individually generate any prerequisite models/state that is missing
+        if not Settings.get("private_key"):
             call_command("generatekeys", verbosity=options.get("verbosity"))
+        if not Device.objects.count():
             call_command("initdevice", hostname, description, verbosity=options.get("verbosity"))
+        if not Facility.objects.count():
             Facility.initialize_default_facility()
 
+        # Install data
+        # if install_clean:
+        #     # Create device, load on any zone data
+        #     call_command("generatekeys", verbosity=options.get("verbosity"))
+        #     call_command("initdevice", hostname, description, verbosity=options.get("verbosity"))
+        #     Facility.initialize_default_facility()
+
         #else:
             # Device exists; load data if required.
             #

kalite/distributed/templates/distributed/exercise.html

@@ -145,7 +145,7 @@ <h2>
                                                 {% if forloop.first and video.availability.en.thumbnail %}
                                                     <li>
                                                         <div class="thumbnail">
-                                                            <a class="related-video" href="{{ video.path }}" title="{% trans video.title %}" target="_blank">
+                                                            <a class="related-video" href="{{ video.path }}" title="{% trans video.title %}">
                                                                 <div class="thumb">
                                                                     <img class="thumbimage" src="{{ video.availability.en.thumbnail }}"/>
                                                                     <div class="thumbnail_label" style="margin-top: 68px; ">
@@ -162,7 +162,7 @@ <h2>
 
                                                 {% else %}
                                                     <li>
-                                                        <a class="related-video related-video-inline" href="{{ video.path }}" title="{% trans video.title %}" target="_blank">
+                                                        <a class="related-video related-video-inline" href="{{ video.path }}" title="{% trans video.title %}">
                                                             <span class="video-title">
                                                                 <span class="progress-circle" data-video-id="{{ video.id }}"></span>
                                                                 {% trans video.title %}

kalite/distributed/templates/distributed/help_admin.html

@@ -37,7 +37,7 @@ <h2>{% trans "(Online) Help Documents" %}</h2>
             <td class="desc"> {% trans "Contains the latest information about setting up and using KA Lite." %}</td>
         </tr>
         <tr class="client-online-only">
-            <td class="link"><a href="http://{{central_server_host}}/faq" target="_blank">{% trans "FAQ" %}</a></td>
+            <td class="link"><a href="https://learningequality.org/ka-lite/faq/" target="_blank">{% trans "FAQ" %}</a></td>
             <td class="desc">{% trans "Contains the latest FAQ for troubleshooting." %}</td>
         </tr>
 

kalite/version.py

@@ -3,6 +3,23 @@
 VERSION = "0.12.0"
 VERSION_INFO = {
 
+    "0.12.4": {
+        "release_date": "2014/08/07",
+        "git_commit": "8c3c3",
+        "new_features": {
+            "all": [],
+            "students": [],
+            "coaches": [],
+            "admins": [],
+        },
+        "bugs_fixed": {
+            "all": ["Run setup when database is not initialized on startup"],
+            "students": ["Stop opening new tabs when opening related videos from exercises"],
+            "coaches": [],
+            "admins": [],
+        },
+    },
+
     "0.12.3": {
         "release_date": "2014/08/02",
         "git_commit": "90f88",