vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

UI improvements to entity-search and the create-external-notification-dialog

Browse source
This commit is contained in:
Joseph Schorr 2014-07-18 16:51:05 -04:00
parent 752efb9e0f
commit d5d9cb7a45
3 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/directives/create-external-notification-dialog.html
View file

@ -17,7 +17,7 @@
<td style="width: 120px">When this occurs:</td> <td style="width: 120px">When this occurs:</td>
<td> <td>
<div class="dropdown-select" placeholder="'(Notification Event)'" selected-item="currentEvent.title" <div class="dropdown-select" placeholder="'(Notification Event)'" selected-item="currentEvent.title"
handle-item-selected="handleEventSelected(datum)"> handle-item-selected="handleEventSelected(datum)" clear-value="clearCounter">
<!-- Icons --> <!-- Icons -->
<i class="dropdown-select-icon fa fa-lg" ng-class="currentEvent.icon"></i> <i class="dropdown-select-icon fa fa-lg" ng-class="currentEvent.icon"></i>
@ -37,7 +37,7 @@
<td>Then issue a:</td> <td>Then issue a:</td>
<td> <td>
<div class="dropdown-select" placeholder="'(Notification Action)'" selected-item="currentMethod.title" <div class="dropdown-select" placeholder="'(Notification Action)'" selected-item="currentMethod.title"
handle-item-selected="handleMethodSelected(datum)"> handle-item-selected="handleMethodSelected(datum)" clear-value="clearCounter">
<!-- Icons --> <!-- Icons -->
<i class="dropdown-select-icon fa fa-lg" ng-class="currentMethod.icon"></i> <i class="dropdown-select-icon fa fa-lg" ng-class="currentMethod.icon"></i>

23
static/directives/entity-search.html
View file

@ -11,6 +11,29 @@
<li role="presentation" class="dropdown-header" ng-show="!lazyLoading && !robots && !isAdmin && !teams"> <li role="presentation" class="dropdown-header" ng-show="!lazyLoading && !robots && !isAdmin && !teams">
You do not have permission to manage teams and robots for this organization You do not have permission to manage teams and robots for this organization
</li> </li>
<li role="presentation" class="dropdown-header"
ng-show="!lazyLoading && !teams.length && !robots.length && !((includeTeams && isOrganization && isAdmin) || (includeRobots && isAdmin))">
<span ng-if="includeRobots && includeTeams && isOrganization">
No robot accounts or teams found
</span>
<span ng-if="!includeRobots && includeTeams && isOrganization">
No teams found
</span>
<span ng-if="includeRobots && !includeTeams && isOrganization">
No robot accounts found
</span>
<span ng-if="!includeRobots && !includeTeams && isOrganization">
Robot accounts and teams are not permitted
</span>
<span ng-if="includeRobots && !isOrganization">
No robot accounts found
</span>
<span ng-if="!includeRobots && !isOrganization">
Robot accounts are not permitted
</span>
</li>
<li role="presentation" ng-repeat="team in teams" ng-show="!lazyLoading" <li role="presentation" ng-repeat="team in teams" ng-show="!lazyLoading"
ng-click="setEntity(team.name, 'team', false)"> ng-click="setEntity(team.name, 'team', false)">

13
static/js/app.js
View file

@ -3985,7 +3985,9 @@ quayApp.directive('dropdownSelect', function ($compile) {
'placeholder': '=placeholder', 'placeholder': '=placeholder',
'lookaheadItems': '=lookaheadItems', 'lookaheadItems': '=lookaheadItems',
'handleItemSelected': '&handleItemSelected', 'handleItemSelected': '&handleItemSelected',
'handleInput': '&handleInput' 'handleInput': '&handleInput',
'clearValue': '=clearValue'
}, },
controller: function($scope, $element, $rootScope) { controller: function($scope, $element, $rootScope) {
if (!$rootScope.__dropdownSelectCounter) { if (!$rootScope.__dropdownSelectCounter) {
@ -3998,6 +4000,13 @@ quayApp.directive('dropdownSelect', function ($compile) {
// Setup lookahead. // Setup lookahead.
var input = $($element).find('.lookahead-input'); var input = $($element).find('.lookahead-input');
$scope.$watch('clearValue', function(cv) {
if (cv) {
$scope.selectedItem = null;
$(input).val('');
}
});
$scope.$watch('selectedItem', function(item) { $scope.$watch('selectedItem', function(item) {
if ($scope.selectedItem == $scope.internalItem) { if ($scope.selectedItem == $scope.internalItem) {
// The item has already been set due to an internal action. // The item has already been set due to an internal action.
@ -4743,6 +4752,7 @@ quayApp.directive('createExternalNotificationDialog', function () {
$scope.currentMethod = null; $scope.currentMethod = null;
$scope.creating = false; $scope.creating = false;
$scope.currentConfig = {}; $scope.currentConfig = {};
$scope.clearCounter = 0;
$scope.events = ExternalNotificationData.getSupportedEvents(); $scope.events = ExternalNotificationData.getSupportedEvents();
$scope.methods = ExternalNotificationData.getSupportedMethods(); $scope.methods = ExternalNotificationData.getSupportedMethods();
@ -4777,6 +4787,7 @@ quayApp.directive('createExternalNotificationDialog', function () {
$scope.$watch('counter', function(counter) { $scope.$watch('counter', function(counter) {
if (counter) { if (counter) {
$scope.clearCounter++;
$scope.creating = false; $scope.creating = false;
$scope.currentEvent = null; $scope.currentEvent = null;
$scope.currentMethod = null; $scope.currentMethod = null;