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

Merge v2.4.0-release into cherrypick-2.4.0

Browse source
This commit is contained in:
Evan Cordell 2017-07-10 10:25:18 -04:00
commit 939ddfd1d7
15 changed files with 120 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
static/js/directives/ui/global-message-tab.js
View file

@ -38,15 +38,15 @@ angular.module('quay').directive('globalMessageTab', function () {
ApiService.createGlobalMessage(data, null).then(function (resp) {
$scope.creatingMessage = false;
$scope.newMessage = {
'media_type': 'text/markdown',
'severity': 'info'
};
$('#createMessageModal').modal('hide');
$scope.loadMessageInternal();
}, errorHandler)
};
$scope.updateMessage = function(content) {
$scope.newMessage.content = content;
};
$scope.showDeleteMessage = function (uuid) {
$scope.messageToDelete = uuid;

4
static/js/directives/ui/request-service-key-dialog.js
View file

@ -108,6 +108,10 @@ angular.module('quay').directive('requestServiceKeyDialog', function () {
$scope.keyCreated({'key': resp});
}, ApiService.errorDisplay('Could not create service key'));
};
$scope.updateNotes = function(content) {
$scope.preshared.notes = content;
};
$scope.$watch('requestKeyInfo', function(info) {
if (info && info.service) {

7
static/js/directives/ui/search-box/search-box.component.html
View file

@ -31,8 +31,11 @@
<span class="avatar" data="result.namespace.avatar" size="16"></span>
<span class="result-name">{{ result.namespace.name }}/{{ result.name }}</span>
<div class="result-description" ng-if="result.description">
<div class="description markdown-view" content="result.description"
first-line-only="true" placeholder-needed="false"></div>
<div class="description">
<markdown-view content="result.description"
first-line-only="true"
placeholder-needed="false"></markdown-view>
</div>
</div>
</span>
<span ng-switch-when="application">

14
static/js/directives/ui/service-keys-manager.js
View file

@ -168,6 +168,10 @@ angular.module('quay').directive('serviceKeysManager', function () {
loadServiceKeys();
}, ApiService.errorDisplay('Could not create service key'));
};
$scope.updateNewKeyNotes = function(content) {
$scope.newKey.notes = content;
};
$scope.showApproveKey = function(key) {
$scope.approvalKeyInfo = {
@ -195,6 +199,10 @@ angular.module('quay').directive('serviceKeysManager', function () {
callback(true);
}, errorHandler);
};
$scope.updateApprovalKeyInfoNotes = function(content) {
$scope.approvalKeyInfo.notes = content;
};
$scope.showCreateKey = function() {
$scope.newKey = {
@ -351,7 +359,11 @@ angular.module('quay').directive('serviceKeysManager', function () {
forAllKeys(info.keys, 'Could not approve service key', performer, callback);
};
$scope.updateApproveKeysInfoNotes = function(content) {
$scope.approveKeysInfo.notes = content;
};
$scope.changeKeysExpiration = function(info, callback) {
var performer = function(key) {
var data = {

5
static/js/pages/setup.js
View file

@ -1,3 +1,5 @@
import * as URI from 'urijs';
(function() {
/**
* The Setup page provides a nice GUI walkthrough experience for setting up Quay Enterprise.
@ -236,11 +238,10 @@
$scope.serializeDbUri = function(fields) {
if (!fields['server']) { return ''; }
var uri = URI();
try {
if (!fields['server']) { return ''; }
if (!fields['database']) { return ''; }
var uri = URI();
uri = uri && uri.host(fields['server']);
uri = uri && uri.protocol(fields['kind']);
uri = uri && uri.username(fields['username']);