Merge pull request #65 from sakshityagi/master

Fixed the pivotal tracker issue #123079011 for Done cannot be clicked
BuildFire · Jun 29, 2016 · a8bb9e2 · a8bb9e2
2 parents 58082bd + a975d21
commit a8bb9e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/control/content/controllers/content.event.controller.js b/control/content/controllers/content.event.controller.js
@@ -46,6 +46,7 @@
         };
 
         ContentEvent.isValidEvent = function (event) {
+          balanceDateTime()
           if (event.isAllDay) {
             // Check if start date of the event is not less than repeat event starts on date
             if (event.repeat && event.repeat.isRepeating && event.repeat.startDate)

diff --git a/control/content/templates/event.html b/control/content/templates/event.html
@@ -71,7 +71,7 @@
   <hr class="none">
   <div class="item clearfix row">
     <div class="labels col-md-3 padding-right-zero pull-left">
-      <span>End Date</span>
+      <span>End Date *</span>
     </div>
     <div class="main col-md-9 pull-right">
       <input type="date"
@@ -83,7 +83,7 @@
   <hr class="none">
   <div class="item clearfix row" ng-if="!ContentEvent.event.data.isAllDay">
     <div class="labels col-md-3 padding-right-zero pull-left">
-      <span>End Time</span>
+      <span>End Time *</span>
     </div>
     <div class="main col-md-9 pull-right">
       <input type="time" class="form-control"