zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-19 14:31:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked logic around the lookup modal and new form lookup fields in order to support dynamic breadcrumbs and selecting applications with the same name.

Browse Source
This commit is contained in:
mabashian
2018-07-09 15:52:58 -04:00
committed by Jared Tabor
parent 0f5c4a4bf7
commit 8a2be07ccb
10 changed files with 73 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
awx/ui/client/lib/components/input/lookup.directive.js
View File

@@ -34,23 +34,20 @@ function AtInputLookupController (baseInputController, $q, $state) {
}
};
scope.$watch(scope.state._resource, vm.watchResource);
// This should get triggered when the user selects something in the lookup modal and
// hits save to close the modal. This won't get triggered when the user types in
// a value in the input.
scope.$watch('state._idFromModal', () => {
if (scope.state._idFromModal &&
(scope.state._idFromModal !== scope.state._value)
) {
vm.search({ id: scope.state._idFromModal });
}
});
vm.check();
};
vm.watchResource = () => {
if (!scope[scope.state._resource]) {
return;
}
if (scope[scope.state._resource] !== scope.state._value) {
scope.state._displayValue = scope[`${scope.state._resource}_name`];
vm.search();
}
};
vm.lookup = () => {
const params = {};
@@ -62,6 +59,7 @@ function AtInputLookupController (baseInputController, $q, $state) {
};
vm.reset = () => {
scope.state._idFromModal = undefined;
scope.state._value = undefined;
scope[scope.state._resource] = undefined;
};
@@ -80,15 +78,20 @@ function AtInputLookupController (baseInputController, $q, $state) {
vm.searchAfterDebounce();
};
vm.search = () => {
vm.search = (searchParams) => {
scope.state._touched = true;
if (scope.state._displayValue === '' && !scope.state._required) {
if (!scope.state._required &&
scope.state._displayValue === '' &&
!scope.state._idFromModal
) {
scope.state._value = null;
return vm.check({ isValid: true });
}
return model.search({ [search.key]: scope.state._displayValue }, search.config)
searchParams = searchParams || { [search.key]: scope.state._displayValue };
return model.search(searchParams, search.config)
.then(found => {
if (!found) {
vm.reset();
@@ -99,6 +102,7 @@ function AtInputLookupController (baseInputController, $q, $state) {
scope[scope.state._resource] = model.get('id');
scope.state._value = model.get('id');
scope.state._displayValue = model.get('name');
scope.state._idFromModal = undefined;
})
.catch(() => vm.reset())
.finally(() => {

4
awx/ui/client/lib/components/input/lookup.partial.html
View File

@@ -30,6 +30,4 @@
<at-input-message></at-input-message>
</div>
<div ui-view="{{ state._resource }}"></div>
</div>
</div>