corrects syntax + add migrations

cms/static/cms/js/modules/cms.modal.js

@@ -465,10 +465,11 @@ $(document).ready(function () {
 				row = iframe.contents().find('.save-box:eq(0)');
 			}
 			row.hide(); // hide submit-row
-			form = iframe.contents().find('form');
+			var form = iframe.contents().find('form');
 			//avoids conflict between the browser's form validation and Django's validation
-			form.submit(function(e){
+			form.submit(function(){
 				if (that.hideFrame) { //submit button was clicked
+					debugger;
 					that.modal.find('.cms_modal-frame iframe').hide();
 					//page has been saved, run checkup
 					that.saved = true;
@@ -516,7 +517,7 @@ $(document).ready(function () {
  							that.options.newPlugin = null;
  							// reset onClose when delete is triggered
 							if(item.hasClass('deletelink')) that.options.onClose = null;
-							if (! item.hasClass('default')) {// hide iframe when using buttons other than submit
+							if (!item.hasClass('default')) { // hide iframe when using buttons other than submit
 								that.modal.find('.cms_modal-frame iframe').hide();
 								// page has been saved or deleted, run checkup
 								that.saved = true;

cms/test_utils/project/placeholderapp/migrations_django/0005_example1_decimal_field.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('placeholderapp', '0004_auto_20150415_1913'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='example1',
+            name='decimal_field',
+            field=models.DecimalField(null=True, max_digits=5, decimal_places=1, blank=True),
+            preserve_default=True,
+        ),
+    ]

cms/tests/frontend.py

@@ -6,9 +6,14 @@
 
 from django.contrib.auth.models import Permission
 from django.contrib.sites.models import Site
+from django import get_version
+from distutils.version import StrictVersion
+if StrictVersion(get_version()) >= StrictVersion('1.7'):
+    from django.contrib.staticfiles.testing import StaticLiveServerTestCase as LiveServerTestCase
+else:
+    from django.test import LiveServerTestCase
 from django.core.cache import cache
 from django.core.urlresolvers import clear_url_caches
-from django.test import LiveServerTestCase
 from django.utils import unittest
 from selenium import webdriver
 from selenium.webdriver.common.by import By