Skip to content

Commit e856236

Browse files
committed
"Checkbox and dropdown added"
Merge branch 'master' of https://github.com/onecloud/ntt_tool_python
2 parents 903feb9 + db0356f commit e856236

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

‎ntt_tool/apps/cloud/views.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ class CloudTrafficTenantsViewSet(viewsets.ModelViewSet):
4141

4242
def list(self, request, *args, **kwargs):
4343
traffic_id = self.request.GET.get("traffic_id")
44-
queryset = self.filter_queryset(CloudTrafficTenants.objects.filter(cloud_traffic_id=traffic_id))
44+
queryset = self.filter_queryset(
45+
CloudTrafficTenants.objects.filter(cloud_traffic_id=traffic_id))
4546

4647
page = self.paginate_queryset(queryset)
4748
if page is not None:

‎ntt_tool/static/js/apps/controllers/cloudcontroller.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ nttApp.controller('CloudTrafficCtrl', function($scope, $routeParams, $location,
6565
$scope.cloud = data;
6666
});
6767

68-
$scope.cloudTraffic = {};
68+
$scope.cloudTraffic = {
69+
"tenant_type": "all"
70+
};
6971
if($scope.event == 'edit'){
7072
cloudTrafficService.get($routeParams.trafficId).then(function(data){
7173
$scope.cloudTraffic = data;

‎ntt_tool/static/partials/cloud/cloudtraffic_form.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,13 @@ <h4>Cloud > Traffic</h4>
4747
</div>
4848
<div class="form-group">
4949
<label>Type</label>
50-
<input type="text" class="form-control" id="type" ng-model="cloudTraffic.tenant_type" value="all" placeholder="All" required>
50+
<select class="form-control" ng-model="cloudTraffic.tenant_type">
51+
<option value="all">All</option>
52+
<option value="intra-tenant">Intra Tenant</option>
53+
<option value="inter-tenant">Inter Tenant</option>
54+
<option value="south-north">South to North</option>
55+
<option value="north-south">North to South</option>
56+
</select>
5157
</div>
5258
<a href="#/cloud/{$ cloud.id $}/" class="btn btn-default">Cancel</a>
5359
<button type="submit" class="btn btn-primary">Save</button>

0 commit comments

Comments
 (0)