Sfoglia il codice sorgente

Fixed issue with date range form validation, Closes #1485

Torkel Ödegaard 11 anni fa
parent
commit
8828db4fce
1 ha cambiato i file con 4 aggiunte e 7 eliminazioni
  1. 4 7
      src/app/panels/timepicker/custom.html

+ 4 - 7
src/app/panels/timepicker/custom.html

@@ -44,7 +44,7 @@
 	</style>
 	</style>
 
 
 	<div class="timepicker form-horizontal">
 	<div class="timepicker form-horizontal">
-		<form name="input">
+		<form name="timeForm" style="margin-bottom: 0">
 
 
 			<div class="timepicker-from-column">
 			<div class="timepicker-from-column">
 				<label class="small">From</label>
 				<label class="small">From</label>
@@ -73,12 +73,9 @@
 				</div>
 				</div>
 			</div>
 			</div>
 
 
+			<br>
+			<button ng-click="setAbsoluteTimeFilter(validate(temptime));dismiss();" ng-disabled="!timeForm.$valid" class="btn btn-success">Apply</button>
+			<span class="" ng-hide="input.$valid">Invalid date or range</span>
 		</form>
 		</form>
-		<div class="clearfix"></div>
 	</div>
 	</div>
-
-	<form name="input" style="margin-bottom:0">
-		<span class="" ng-hide="input.$valid">Invalid date or range</span>
-		<button ng-click="setAbsoluteTimeFilter(validate(temptime));dismiss();" ng-disabled="!input.$valid" class="btn btn-success">Apply</button>
-	</form>
 </div>
 </div>