HAWKULAR-516 : Add support for Driver Major and Minor Versions

hawkular · Sep 18, 2015 · ae77500 · ae77500
1 parent c9d74c4
commit ae77500
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...c/main/scripts/plugins/metrics/html/app-details/modals/detail-datasources-driver-add.html b/...c/main/scripts/plugins/metrics/html/app-details/modals/detail-datasources-driver-add.html
@@ -81,14 +81,14 @@ <h4 class="modal-title">Add JDBC Driver</h4>
             <label class="col-sm-4 control-label" for="dmv">Driver Major Version</label>
             <div class="col-sm-6">
               <input type="number" min="0" value="1" class="form-control hk-input-small" id="dmv"
-                     ng-model="dac.driver.driverMajorVersion">
+                     ng-model="dac.driverData.driverMajorVersion">
             </div>
           </div>
           <div class="form-group">
             <label class="col-sm-4 control-label" for="dmiv">Driver Minor Version</label>
             <div class="col-sm-6">
               <input type="number" min="0" value="1" class="form-control hk-input-small" id="dmiv"
-                     ng-model="dac.driver.driverMinorVersion">
+                     ng-model="dac.driverData.driverMinorVersion">
             </div>
           </div>
         </fieldset>
@@ -162,13 +162,13 @@ <h4 class="modal-title">Add JDBC Driver</h4>
           <div class="form-group">
             <label class="col-sm-4 control-label" for="dmv">Driver Major Version</label>
             <div class="col-sm-6">
-              <span class="hk-input-text">{{dac.driver.driverMajorVersion || '-'}}</span>
+              <span class="hk-input-text">{{dac.driverData.driverMajorVersion || '-'}}</span>
             </div>
           </div>
           <div class="form-group">
             <label class="col-sm-4 control-label" for="dmiv">Driver Minor Version</label>
             <div class="col-sm-6">
-              <span class="hk-input-text">{{dac.driver.driverMinorVersion || '-'}}</span>
+              <span class="hk-input-text">{{dac.driverData.driverMinorVersion || '-'}}</span>
             </div>
           </div>
         </fieldset>

diff --git a/...main/scripts/plugins/metrics/ts/app-details/modals/appServerDatasourcesDriverAddDialog.ts b/...main/scripts/plugins/metrics/ts/app-details/modals/appServerDatasourcesDriverAddDialog.ts
@@ -122,8 +122,8 @@ module HawkularMetrics {
         this.driverData.driverName,
         this.driverData.moduleName,
         this.driverData.driverClass,
-        // TODO: this.driverData.driver.driverMajorVersion,
-        // TODO: this.driverData.driver.driverMinorVersion,
+        this.driverData.driverMajorVersion,
+        this.driverData.driverMinorVersion,
         this.driverData.binaryFile,
         this.$rootScope.userDetails.token,
         this.$rootScope.currentPersona.id);