External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-20 12:40:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
John Mitchell
2019-08-01 16:20:45 -04:00
committed by AlanCoding
parent 03d72dd18a
commit 13751e73f9
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/projects/add/projects-add.controller.js
View File

@@ -128,6 +128,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
$scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
$scope.scmRequired = ($scope.scm_type.value !== 'manual') ? true : false;
$scope.scmBranchLabel = i18n._('SCM Branch');
$scope.scmRefspecLabel = i18n._('SCM Refspec');
// Dynamically update popover values
if ($scope.scm_type.value) {
if(($scope.lookupType === 'insights_credential' && $scope.scm_type.value !== 'insights') || ($scope.lookupType === 'scm_credential' && $scope.scm_type.value === 'insights')) {

1
awx/ui/client/src/projects/edit/projects-edit.controller.js
View File

@@ -250,6 +250,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
$scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
$scope.scmRequired = ($scope.scm_type.value !== 'manual') ? true : false;
$scope.scmBranchLabel = i18n._('SCM Branch');
$scope.scmRefspecLabel = i18n._('SCM Refspec');
// Dynamically update popover values
if ($scope.scm_type.value) {

17
awx/ui/client/src/projects/projects.form.js
View File

@@ -125,6 +125,23 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
type: 'text',
ngShow: "scm_type && scm_type.value !== 'manual' && scm_type.value !== 'insights'",
ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)',
awPopOver: '<p>' + i18n._("Branch to checkout. You can input other refs like tags and commit hashes as well. You can set a custom refspec, to allow for other refs to be input.") + '</p>',
dataTitle: i18n._('SCM Branch'),
subForm: 'sourceSubForm',
},
scm_refspec: {
labelBind: "scmRefspecLabel",
type: 'text',
ngShow: "scm_type && scm_type.value === 'git'",
ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)',
awPopOver: '<p>' + i18n._('A refspec to fetch (passed to the Ansible git module). This parameter allows access to references via the branch field not otherwise available.') + '</p>' +
'<p>' + i18n._('NOTE: This field assumes the remote name is "origin".') + '</p>' +
'<p>' + i18n._('Examples include:') + '</p>' +
'</p><ul class=\"no-bullets\"><li>refs/*:refs/remotes/origin/*</li>' +
'<li>refs/pull/62/head:refs/remotes/origin/pull/62/head</li></ul>' +
'<p>' + i18n._('The first fetches all references. The second fetches only the Github pull request number 62, in this example the branch needs to be `refs/pull/62/head`.') +
'</p>',
dataTitle: i18n._('SCM Refspec'),
subForm: 'sourceSubForm',
},
credential: {