improve "create event" usability: default expiration date for ticket …

…categories is event start date
alfio-event · Aug 28, 2016 · c8ed624 · c8ed624
1 parent 7ec811d
commit c8ed624
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/edit-category.html b/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/edit-category.html
@@ -90,7 +90,7 @@ <h4>Category visibility:</h4>
         <div class="col-sm-12 col-md-4">
             <div class="form-group" bs-form-error="ticketCategory.dateString">
                 <label for="{{buildPrefix($index, 'dateString')}}">Validity range</label>
-                <input type="text" data-date-range data-start-model="ticketCategory.inception" data-end-model="ticketCategory.expiration" data-watch-obj="event.start" data-start-date="ticketCategory.notBefore" data-ng-model="ticketCategory.dateString" name="{{buildPrefix($index, 'dateString')}}" id="{{buildPrefix($index, 'dateString')}}" class="form-control" required />
+                <input type="text" data-date-range data-start-model="ticketCategory.inception" data-end-model="ticketCategory.expiration" data-watch-obj="event.begin" data-start-date="ticketCategory.notBefore" data-ng-model="ticketCategory.dateString" name="{{buildPrefix($index, 'dateString')}}" id="{{buildPrefix($index, 'dateString')}}" class="form-control" required />
                 <field-error data-form-obj="ticketCategory" data-field-obj="ticketCategory.dateString" data-show-existing-errors="showExistingErrors"></field-error>
             </div>
         </div>

diff --git a/src/main/webapp/resources/js/admin/directive/admin-directive.js b/src/main/webapp/resources/js/admin/directive/admin-directive.js
@@ -114,7 +114,7 @@
                 }
 
                 if(scope.watchObj) {
-                    var clearListener = scope.$watch(function() { return scope.watchObj; }, function(newVal, oldVal) {
+                    var clearListener = scope.$watch('watchObj', function(newVal, oldVal) {
                         if(newVal && newVal['date']) {
                             var dr = pickerElement.data('daterangepicker');
                             if(angular.equals({date: dr.endDate.format('YYYY-MM-DD'), time: dr.endDate.format('HH:mm')}, oldVal)) {

diff --git a/src/main/webapp/resources/js/admin/ng-app/admin-application.js b/src/main/webapp/resources/js/admin/ng-app/admin-application.js
@@ -174,16 +174,14 @@
             date: now.format('YYYY-MM-DD'),
             time: now.format('HH:mm')
         };
-        var category = {
+        return {
             inception: inceptionDateTime,
             expiration: expirationDateTime,
             tokenGenerationRequested: false,
             sticky: sticky,
             bounded: false
         };
 
-        return category;
-
     };
 
     var createAndPushCategory = function(sticky, $scope) {