Make sure to filter out the build-related notification events when build support is turned off
This commit is contained in:
		
							parent
							
								
									9aa72c5cc2
								
							
						
					
					
						commit
						6dfdb2fe03
					
				
					 1 changed files with 29 additions and 21 deletions
				
			
		|  | @ -1312,29 +1312,37 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading | |||
|         'id': 'repo_push', | ||||
|         'title': 'Push to Repository', | ||||
|         'icon': 'fa-upload' | ||||
|       }, | ||||
|       {  | ||||
|         'id': 'build_queued', | ||||
|         'title': 'Dockerfile Build Queued', | ||||
|         'icon': 'fa-tasks' | ||||
|       }, | ||||
|       {  | ||||
|         'id': 'build_start', | ||||
|         'title': 'Dockerfile Build Started', | ||||
|         'icon': 'fa-circle-o-notch' | ||||
|       }, | ||||
|       {  | ||||
|         'id': 'build_success', | ||||
|         'title': 'Dockerfile Build Successfully Completed', | ||||
|         'icon': 'fa-check-circle-o' | ||||
|       }, | ||||
|       {  | ||||
|         'id': 'build_failure', | ||||
|         'title': 'Dockerfile Build Failed', | ||||
|         'icon': 'fa-times-circle-o' | ||||
|       } | ||||
|     ]; | ||||
| 
 | ||||
|     if (Features.BUILD_SUPPORT) { | ||||
|       var buildEvents = [ | ||||
|         {  | ||||
|           'id': 'build_queued', | ||||
|           'title': 'Dockerfile Build Queued', | ||||
|           'icon': 'fa-tasks' | ||||
|         }, | ||||
|         {  | ||||
|           'id': 'build_start', | ||||
|           'title': 'Dockerfile Build Started', | ||||
|           'icon': 'fa-circle-o-notch' | ||||
|         }, | ||||
|         {  | ||||
|           'id': 'build_success', | ||||
|           'title': 'Dockerfile Build Successfully Completed', | ||||
|           'icon': 'fa-check-circle-o' | ||||
|         }, | ||||
|         {  | ||||
|           'id': 'build_failure', | ||||
|           'title': 'Dockerfile Build Failed', | ||||
|           'icon': 'fa-times-circle-o' | ||||
|         }]; | ||||
| 
 | ||||
|       for (var i = 0; i < buildEvents.length; ++i) { | ||||
|         events.push(buildEvents[i]); | ||||
|       } | ||||
|     } | ||||
| 
 | ||||
|     var methods = [ | ||||
|       { | ||||
|         'id': 'quay_notification', | ||||
|  | @ -1696,7 +1704,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading | |||
|       keyService['googleRedirectUri'] = Config.getUrl('/oauth2/google/callback'); | ||||
| 
 | ||||
|       keyService['googleLoginUrl'] = 'https://accounts.google.com/o/oauth2/auth?response_type=code&'; | ||||
|       keyService['githubLoginUrl'] = 'https://github.com/login/oauth/authorize?'; | ||||
|       keyService['githubLoginUrl'] = Config['GITHUB_LOGIN_URL'] + '?'; | ||||
| 
 | ||||
|       keyService['googleLoginScope'] = 'openid email'; | ||||
|       keyService['githubLoginScope'] = 'user:email'; | ||||
|  |  | |||
		Reference in a new issue