Changes the logic for 'mailto' check and adds 'reconnection' attribute

to test database
HappyMelly · Apr 26, 2015 · ac7d789 · ac7d789
1 parent 966ce00
commit ac7d789
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/app/assets/event/form.js b/app/assets/event/form.js
@@ -155,7 +155,7 @@ function checkTotalHours(hours) {
  */
 function checkUrl(url, element) {
     var field = element + '_field';
-    if ($.trim(url).length == 0) {
+    if ($.trim(url).length == 0 || (url.substring(0, 6) == "mailto")) {
         $(field).removeClass('has-error');
         $(field).removeClass('has-success');
         $(element).siblings('span').each(function() {
@@ -339,10 +339,7 @@ $(document).ready( function() {
         checkUrl($(this).val(), '#details_webSite');
     });
     $('#details_registrationPage').on('change', function(e) {
-        var url = $(this).val();
-        if (url.substring(0, 4) == "http") {
-            checkUrl(url, '#details_registrationPage');
-        }
+        checkUrl($(this).val(), '#details_registrationPage');
     });
     var brandId = $('#brandId').find(':selected').val();
     getEventTypes(brandId, $('#currentEventTypeId').attr('value'));

diff --git a/test/integration/PlayAppSpec.scala b/test/integration/PlayAppSpec.scala
@@ -42,7 +42,7 @@ trait PlayAppSpec extends PlaySpecification with BeforeAllAfterAll {
   sequential
   lazy val app: FakeApplication = {
     val conf = Map(
-      "db.default.url" -> "jdbc:mysql://localhost/teller_test",
+      "db.default.url" -> "jdbc:mysql://localhost/teller_test?reconnect=true&characterEncoding=UTF-8",
       "db.default.user" -> "root",
       "db.default.password" -> "",
       "logger.play" -> "ERROR",