Listing.html stage 2

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index 3c0b80434cb18eea49afa05003f54b0358e52141..312760ad18c8164a6216db5a622b9c67342ed79d 100644 (file)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -39,6 +39,7 @@
               return crmApi('MailingAB', 'getsingle', {id: $route.current.params.id});
             }
             else {
+              console.log("created");
               //created_id has been set to my id. Does not save without created_id. Needs to made generic based on the user
               return { just_created:"1"
               };
@@ -108,15 +109,16 @@
         { name: 'From Name', url: partialUrl('from_name.html'),val:2},
         {name: 'Two different Emails', url: partialUrl('two_emails.html'),val:3}
       ];
-    if(typeof $scope.template == 'undefined'){
-    console.log("adi");
-      $scope.template = $scope.templates[0];
-  }
-    else{
+    if($scope.currentABTest.just_created != 1){
+
       console.log("adit "+$scope.currentABTest.testing_criteria_id);
 
       $scope.template=$scope.templates[$scope.currentABTest.testing_criteria_id-1];
       console.log($scope.template.val);
+  }
+    else{
+      console.log("adi");
+      $scope.template = $scope.templates[0];
     }
 
     mltokens = CRM.crmMailing.mailTokens;
@@ -781,9 +783,9 @@
           dateFormat: "yy-mm-dd",
           onSelect: function(date) {
             $(".ui-datepicker a").removeAttr("href");
-            scope.scheddate.date=date.toString();
+            scope.currentABTest.date=date.toString();
             scope.$apply();
-            console.log(scope.scheddate.date);
+            console.log(scope.currentABTest.date);
           }
         });
       }

diff --git a/partials/abtesting/main.html b/partials/abtesting/main.html
index a612dd3a04d9da2863b4fc22b3917e541e54c4d9..9018d52e7e91ffbc9a97710c7de1d9ccea4cf41a 100644 (file)
--- a/partials/abtesting/main.html
+++ b/partials/abtesting/main.html
@@ -1,6 +1,6 @@
 <div>
   {{tab_val}}<br>
-  
+
   <div ui-jq="tabs" id="alltabs">
     <ul>