External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6311 from jlmitch5/fixDupID

Browse Source 
change duplicate IDs where possible

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-03-18 01:03:49 +00:00 committed by GitHub
commit 88d7b24f55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 59 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/features/credentials/legacy.credentials.js
View File

@ -70,7 +70,7 @@ function LegacyCredentialsService () {
label: N_('Add'),
awToolTip: N_('Add a permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},

2
awx/ui/client/features/templates/index.view.html
View File

@ -1,6 +1,6 @@
<div ui-view="scheduler"></div>
<div ui-view="form"></div>
<at-panel ng-cloak id="htmlTemplate">
<at-panel ng-cloak>
<div ng-if="$state.includes('templates')">
<at-panel-heading
title="{{:: vm.strings.get('list.PANEL_TITLE') }}"

2
awx/ui/client/src/credentials/credentials.form.js
View File

@ -446,7 +446,7 @@ export default ['i18n', function(i18n) {
label: i18n._('Add'),
awToolTip: i18n._('Add a permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},

1
awx/ui/client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html
View File

@ -58,4 +58,3 @@
</div>
</div>
</div>
<prompt prompt-data="promptData" on-finish="launchJob()"></prompt>

6
awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html
View File

@ -79,13 +79,13 @@
</div>
<div class="List-actionsContainer col-md-3 col-sm-4">
<div class="List-actionButtonCell List-tableCell">
<button id="insights-action" aria-label="{{strings.get('insights.VIEW')}}" class="List-actionButton " ng-class="{'List-actionButton--selected' : $stateParams['host_id'] == host.id && $state.is('hosts.edit.insights')}" data-placement="top" ng-click="goToInsights(host.id)" aw-tool-tip="{{strings.get('inventory.VIEW_INSIGHTS')}}" data-tip-watch="strings.get('inventory.VIEW_INSIGHTS')" ng-show="host.insights_system_id && host.summary_fields.inventory.hasOwnProperty('insights_credential_id')">
<button id="host-{{host.id}}-insights-action" aria-label="{{strings.get('insights.VIEW')}}" class="List-actionButton " ng-class="{'List-actionButton--selected' : $stateParams['host_id'] == host.id && $state.is('hosts.edit.insights')}" data-placement="top" ng-click="goToInsights(host.id)" aw-tool-tip="{{strings.get('inventory.VIEW_INSIGHTS')}}" data-tip-watch="strings.get('inventory.VIEW_INSIGHTS')" ng-show="host.insights_system_id && host.summary_fields.inventory.hasOwnProperty('insights_credential_id')">
<i class="fa fa-info"></i>
</button>
<button id="edit-action" aria-label="{{strings.get('inventory.EDIT_HOST')}}" class="List-actionButton " ng-class="{'List-editButton--selected' : $stateParams['host_id'] == host.id && $state.is('hosts.edit') }" data-placement="top" ng-click="editHost(host.id)" aw-tool-tip="{{strings.get('inventory.EDIT_HOST')}}" data-tip-watch="strings.get('inventory.VIEW_HOST')" ng-show="host.summary_fields.user_capabilities.edit">
<button id="host-{{host.id}}-edit-action" aria-label="{{strings.get('inventory.EDIT_HOST')}}" class="List-actionButton " ng-class="{'List-editButton--selected' : $stateParams['host_id'] == host.id && $state.is('hosts.edit') }" data-placement="top" ng-click="editHost(host.id)" aw-tool-tip="{{strings.get('inventory.EDIT_HOST')}}" data-tip-watch="strings.get('inventory.VIEW_HOST')" ng-show="host.summary_fields.user_capabilities.edit">
<i class="fa fa-pencil"></i>
</button>
<button id="view-action" aria-label="{{strings.get('inventory.VIEW_HOST')}}" class="List-actionButton " data-placement="top" ng-click="editHost(host.id)" aw-tool-tip="{{strings.get('inventory.VIEW_HOST')}}" data-tip-watch="strings.get('inventory.VIEW_HOST')" ng-show="!host.summary_fields.user_capabilities.edit"><i class="fa fa-search-plus"></i>
<button id="host-{{host.id}}-view-action" aria-label="{{strings.get('inventory.VIEW_HOST')}}" class="List-actionButton " data-placement="top" ng-click="editHost(host.id)" aw-tool-tip="{{strings.get('inventory.VIEW_HOST')}}" data-tip-watch="strings.get('inventory.VIEW_HOST')" ng-show="!host.summary_fields.user_capabilities.edit"><i class="fa fa-search-plus"></i>
</button>
</div>
</div>

2
awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js
View File

@ -114,7 +114,7 @@ export default ['i18n', function(i18n) {
ngClick: "$state.go('.add')",
awToolTip: i18n._('Add a permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
}

2
awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js
View File

@ -111,7 +111,7 @@ function(i18n) {
ngClick: "$state.go('.add')",
awToolTip: i18n._('Add a permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
}

6
awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
View File

@ -617,19 +617,19 @@
<div class="buttons Form-buttons">
<button type="button"
class="btn btn-sm Form-cancelButton"
id="project_cancel_btn"
id="schedule_close_btn"
ng-show="!(schedule_obj.summary_fields.user_capabilities.edit || canAdd)"
ng-click="formCancel()"
translate>Close</button>
<button type="button"
class="btn btn-sm Form-cancelButton"
id="project_cancel_btn"
id="schedule_cancel_btn"
ng-show="(schedule_obj.summary_fields.user_capabilities.edit || canAdd)"
ng-click="formCancel()"
translate>Cancel</button>
<button type="button"
class="btn btn-sm Form-saveButton"
id="project_save_btn"
id="schedule_save_btn"
ng-click="saveSchedule()"
ng-show="(schedule_obj.summary_fields.user_capabilities.edit || canAdd)"
ng-disabled="scheduler_form.$invalid || !schedulerIsValid"

2
awx/ui/client/src/organizations/organizations.form.js
View File

@ -150,7 +150,7 @@ export default ['NotificationsList', 'i18n',
label: i18n._('Add'),
awToolTip: i18n._('Add a permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(organization_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},

2
awx/ui/client/src/partials/survey-maker-modal.html
View File

@ -79,7 +79,7 @@
<div class="SurveyMaker-panelFooter">
<div class="Form-buttons">
<button id="survey-delete-button" class="btn btn-sm SurveyMaker-deleteButton" ng-show="survey_exists && (job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" ng-click="showDeleteOverlay('survey')" translate>DELETE SURVEY</button>
<button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>CANCEL</button>
<button id="survey-cancel-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>CANCEL</button>
<button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')" ng-show="!(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>CLOSE</button>
<button id="survey-save-button" class="btn btn-sm Form-saveButton" ng-click="saveSurvey()" ng-disabled="(!isEditSurvey && survey_questions.length < 1) || !can_edit || editQuestionIndex !== null" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>SAVE</button>
</div>

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

@ -285,7 +285,7 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
label: i18n._('Add'),
awToolTip: i18n._('Add a permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(project_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},

2
awx/ui/client/src/scheduler/schedulerForm.partial.html
View File

@ -667,7 +667,7 @@
ng-click="prompt()">{{ strings.get('form.PROMPT') }}</button>
<button type="button"
class="btn btn-sm Form-cancelButton"
id="schedule_cancel_btn"
id="schedule_close_btn"
ng-show="!(schedule_obj.summary_fields.user_capabilities.edit || canAdd) || credentialRequiresPassword"
ng-click="formCancel()">{{ strings.get('form.CLOSE') }}</button>
<button type="button"

2
awx/ui/client/src/scheduler/schedules.list.js
View File

@ -81,7 +81,7 @@ export default ['i18n', function(i18n) {
awToolTip: i18n._('Add a new schedule'),
dataTipWatch: 'addTooltip',
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--schedule',
ngShow: 'canAdd',
ngClass: "{ 'Form-tab--disabled': credentialRequiresPassword }"
}

2
awx/ui/client/src/shared/form-generator.js
View File

@ -1944,7 +1944,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
for (act in collection.fieldActions) {
if (act !== 'columnClass') {
fAction = collection.fieldActions[act];
html += "<button aria-label=\"{{act}}\" id=\"" + ((fAction.id) ? fAction.id : act + "-action") + "\" ";
html += "<button aria-label=\"{{act}}\" id=\"" + ((fAction.id) ? fAction.id : collection.iterator + "-" + `{{${collection.iterator}.id}}` + "-" + act + "-action") + "\" ";
html += (fAction.awToolTip) ? 'aw-tool-tip="' + fAction.awToolTip + '"' : '';
html += (fAction.dataPlacement) ? 'data-placement="' + fAction.dataPlacement + '"' : '';
html += (fAction.href) ? "href=\"" + fAction.href + "\" " : "";

2
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@ -424,7 +424,7 @@ export default ['$compile', 'Attr', 'Icon',
} else {
fAction = list.fieldActions[field_action];
innerTable += "<button id=\"";
innerTable += (fAction.id) ? fAction.id : field_action + "-action";
innerTable += (fAction.id) ? fAction.id : `${list.iterator}-{{${list.iterator}.id}}-${field_action}-action`;
innerTable += "\" ";
innerTable += (fAction.href) ? "href=\"" + fAction.href + "\" " : "";
innerTable += (fAction.ngHref) ? "ng-href=\"" + fAction.ngHref + "\" " : "";

6
awx/ui/client/src/shared/paginate/paginate.partial.html
View File

@ -25,14 +25,14 @@
</li>
<!-- last -->
<li class="page-item Paginate-controls--item Paginate-controls--last" ng-hide="(pageRange.length < maxVisiblePages || pageRange[pageRange.length-1] === last)">
<a aria-label="{{'Go to last page of list' | translate}}" href class="page-link" id="last-page-set" ng-click="toPage(last)">
<a aria-label="{{'Go to last page of list' | translate}}"href class="page-link" id="{{iterator}}-last-page-set" ng-click="toPage(last)">
<i class="fa fa-angle-double-right"></i>
</a>
</li>
</ul>
<span class="Paginate-pager--pageof">{{ 'Page' | translate }}
<span id="current-page">{{current}}</span> {{ 'of' | translate }}
<span id="total-pages">{{last}}</span>
<span id="{{iterator}}-current-page">{{current}}</span> {{ 'of' | translate }}
<span id="{{iterator}}-total-pages">{{last}}</span>
</span>
</div>
<div class="Paginate-total page-label" ng-hide="dataset.count === 0">

4
awx/ui/client/src/teams/teams.form.js
View File

@ -85,7 +85,7 @@ export default ['i18n', function(i18n) {
label: i18n._('Add'),
awToolTip: i18n._('Add User'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--user',
ngShow: '(team_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},
@ -169,7 +169,7 @@ export default ['i18n', function(i18n) {
label: i18n._('Add'),
awToolTip: i18n._('Grant Permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(team_obj.summary_fields.user_capabilities.edit || canEditOrg)'
}
}

2
awx/ui/client/src/templates/job_templates/job-template.form.js
View File

@ -540,7 +540,7 @@ function(NotificationsList, i18n) {
label: 'Add',
awToolTip: i18n._('Add a permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
}
},

2
awx/ui/client/src/templates/prompt/prompt.partial.html
View File

@ -1,4 +1,4 @@
<div class="Prompt" id="prompt_modal">
<div class="Prompt">
<at-modal ng-if="vm.promptDataClone">
<at-tab-group>
<at-tab id="prompt_inventory_tab" ng-if="vm.steps.inventory.tab" state="vm.steps.inventory.tab">{{:: vm.strings.get('prompt.INVENTORY') }}</at-tab>

2
awx/ui/client/src/templates/workflows.form.js
View File

@ -295,7 +295,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
label: i18n._('Add'),
awToolTip: i18n._('Add a permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddOrEdit)'
}
},

2
awx/ui/client/src/users/users.form.js
View File

@ -221,7 +221,7 @@ export default ['i18n', function(i18n) {
label: i18n._('Add'),
awToolTip: i18n._('Grant Permission'),
actionClass: 'at-Button--add',
actionId: 'button-add',
actionId: 'button-add--permission',
ngShow: '(!is_superuser && (user_obj.summary_fields.user_capabilities.edit || canAdd))'
}
},

2
awx/ui/test/e2e/objects/sections/permissions.js
View File

@ -6,7 +6,7 @@ import search from './search';
const permissions = {
selector: 'div[ui-view="related"]',
elements: {
add: '#button-add',
add: '#button-add--permission',
badge: 'div[class="List-titleBadge]',
titleText: 'div[class="List-titleText"]',
noitems: 'div[class="List-noItems"]'

4
awx/ui/test/e2e/tests/test-inventories-list-actions.js
View File

@ -98,8 +98,8 @@ module.exports = {
inventories.waitForElementNotVisible('div.spinny');
inventories.expect.element(`#inventories_table .List-tableRow[id="${data.inventory.id}"]`).visible;
inventories.expect.element('#copy-action').visible;
inventories.expect.element('#copy-action[class*="btn-disabled"]').present;
inventories.expect.element(`#inventory-${data.inventory.id}-copy-action`).visible;
inventories.expect.element(`#inventory-${data.inventory.id}-copy-action[class*="btn-disabled"]`).present;
client.end();
}

54
awx/ui/test/e2e/tests/test-xss.js
View File

@ -165,43 +165,47 @@ module.exports = {
client.expect.element('#xss').not.present;
client.expect.element('[class=xss]').not.present;
},
'check user roles list for unsanitized content': client => {
const adminRole = data.project.summary_fields.object_roles.admin_role;
const itemDelete = `#permissions_table .List-tableRow[id="${adminRole.id}"] #delete-action`;
// This test is disabled, because we don't have access to the permission
// id to craft the correct ID selector
// 'check user roles list for unsanitized content': client => {
// const adminRole = data.project.summary_fields.object_roles.admin_role;
// const itemDelete = `#permissions_table .List-tableRow[id="${adminRole.id}"]
// #permission-${"TODO: NEED ROLE ID, don't have fixture to get it"}-delete-action`;
client.expect.element('#permissions_tab').visible;
client.expect.element('#permissions_tab').enabled;
// client.expect.element('#permissions_tab').visible;
// client.expect.element('#permissions_tab').enabled;
client.pause(2000);
client.findThenClick('#permissions_tab', 'css');
// client.pause(2000);
// client.findThenClick('#permissions_tab', 'css');
client.expect.element('#xss').not.present;
client.expect.element('[class=xss]').not.present;
// client.expect.element('#xss').not.present;
// client.expect.element('[class=xss]').not.present;
client.expect.element('div[ui-view="related"]').visible;
client.expect.element('div[ui-view="related"] smart-search input').enabled;
// client.expect.element('div[ui-view="related"]').visible;
// client.expect.element('div[ui-view="related"] smart-search input').enabled;
client.sendKeys('div[ui-view="related"] smart-search input', `id:>${adminRole.id - 1} id:<${adminRole.id + 1}`);
client.sendKeys('div[ui-view="related"] smart-search input', client.Keys.ENTER);
// client.sendKeys('div[ui-view="related"] smart-search input',
// `id:>${adminRole.id - 1} id:<${adminRole.id + 1}`);
// client.sendKeys('div[ui-view="related"] smart-search input', client.Keys.ENTER);
client.expect.element('div.spinny').not.visible;
// client.expect.element('div.spinny').not.visible;
client.expect.element(itemDelete).visible;
client.expect.element(itemDelete).enabled;
// client.expect.element(itemDelete).visible;
// client.expect.element(itemDelete).enabled;
client.click(itemDelete);
// client.click(itemDelete);
client.expect.element('#prompt-header').visible;
client.expect.element('#prompt-header').text.equal('REMOVE ROLE');
client.expect.element('#prompt_cancel_btn').enabled;
// client.expect.element('#prompt-header').visible;
// client.expect.element('#prompt-header').text.equal('REMOVE ROLE');
// client.expect.element('#prompt_cancel_btn').enabled;
client.expect.element('#xss').not.present;
client.expect.element('[class=xss]').not.present;
// client.expect.element('#xss').not.present;
// client.expect.element('[class=xss]').not.present;
client.click('#prompt_cancel_btn');
// client.click('#prompt_cancel_btn');
client.expect.element('#prompt-header').not.visible;
},
// client.expect.element('#prompt-header').not.visible;
// },
'check user permissions view for unsanitized content': client => {
client.expect.element('button[aw-tool-tip="Grant Permission"]').enabled;