summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2017-05-10 11:25:41 +0000
committerGerrit Code Review <gerrit@open-o.org>2017-05-10 11:25:41 +0000
commit6bf0d8e793ef1f55808bb54112f4839a18ee582a (patch)
treefc5438abac620ddb6743d253103c43a8adb3eb90
parent766319d08692368f4c1b3b2130cead4a1c0ac27f (diff)
parentb4ea7529e15c044a948015916306d80c07a4f058 (diff)
Merge "Add Tenant for Site"
-rw-r--r--resmgr/src/main/webapp/resmgr/js/app.js4
-rw-r--r--resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html5
2 files changed, 8 insertions, 1 deletions
diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index 542b0421..dcd0250d 100644
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -493,7 +493,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
/*var siteTenantType = {"ErrMsg" : {"errmsg" : "The tenanttype is required.", "modalVar":"site.tenanttype"}};
$('#myModal #tenanttype').append($compile(Mustache.to_html(text, siteTenantType.ErrMsg))($scope));*/
-
+ var siteTanant = {"ErrMsg" : {"errmsg" : "Tenant is required.", "modalVar":"site.tenantID", "placeholder":"Tenant"}};
+ $('#myModal #Tenant').append($compile(Mustache.to_html(text, siteTanant.ErrMsg))($scope));
+
var siteLocation = {"ErrMsg" : {"errmsg" : "Location is required.", "modalVar":"site.location", "placeholder":"Location"}};
$('#myModal #location').append($compile(Mustache.to_html(text, siteLocation.ErrMsg))($scope));
}
diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
index 76029246..bed77aba 100644
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
@@ -86,6 +86,11 @@
</div>
</div>
<div class="form-group row" id="rowSpacing">
+ <label class="col-xs-4 col-form-label" id="textCenter">Tenant</label>
+ <div id="Tenant" class="col-xs-8" >
+ </div>
+ </div>
+ <div class="form-group row" id="rowSpacing">
<label class="col-xs-4 col-form-label" id="textCenter">Location</label>
<div id="location" class="col-xs-8" >
</div>