mirror of
https://github.com/ansible/awx.git
synced 2026-05-08 01:47:35 -02:30
Fix to open job_templates accordion on initial page load. Fix to missing tooltips for play/stop schedule button within job_templates and projects pages.
This commit is contained in:
@@ -338,7 +338,7 @@ function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeP
|
|||||||
Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, InventoryList,
|
Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, InventoryList,
|
||||||
CredentialList, ProjectList, LookUpInit, GetBasePath, md5Setup, ParseTypeChange, JobStatusToolTip, FormatDate,
|
CredentialList, ProjectList, LookUpInit, GetBasePath, md5Setup, ParseTypeChange, JobStatusToolTip, FormatDate,
|
||||||
Wait, Stream, Empty, Prompt, ParseVariableString, ToJSON, SchedulesControllerInit, JobsControllerInit, JobsListUpdate,
|
Wait, Stream, Empty, Prompt, ParseVariableString, ToJSON, SchedulesControllerInit, JobsControllerInit, JobsListUpdate,
|
||||||
GetChoices) {
|
GetChoices, SchedulesListInit, SchedulesList) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -444,6 +444,17 @@ function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeP
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if ($scope.removerelatedschedules) {
|
||||||
|
$scope.removerelatedschedules();
|
||||||
|
}
|
||||||
|
$scope.removerelatedschedules = $scope.$on('relatedschedules', function() {
|
||||||
|
SchedulesListInit({
|
||||||
|
scope: $scope,
|
||||||
|
list: SchedulesList,
|
||||||
|
choices: null,
|
||||||
|
related: true
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
// Register a watcher on project_name. Refresh the playbook list on change.
|
// Register a watcher on project_name. Refresh the playbook list on change.
|
||||||
if ($scope.watchProjectUnregister) {
|
if ($scope.watchProjectUnregister) {
|
||||||
@@ -790,5 +801,6 @@ JobTemplatesEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$l
|
|||||||
'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit',
|
'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit',
|
||||||
'ReturnToCaller', 'ClearScope', 'InventoryList', 'CredentialList', 'ProjectList', 'LookUpInit',
|
'ReturnToCaller', 'ClearScope', 'InventoryList', 'CredentialList', 'ProjectList', 'LookUpInit',
|
||||||
'GetBasePath', 'md5Setup', 'ParseTypeChange', 'JobStatusToolTip', 'FormatDate', 'Wait', 'Stream', 'Empty', 'Prompt',
|
'GetBasePath', 'md5Setup', 'ParseTypeChange', 'JobStatusToolTip', 'FormatDate', 'Wait', 'Stream', 'Empty', 'Prompt',
|
||||||
'ParseVariableString', 'ToJSON', 'SchedulesControllerInit', 'JobsControllerInit', 'JobsListUpdate', 'GetChoices'
|
'ParseVariableString', 'ToJSON', 'SchedulesControllerInit', 'JobsControllerInit', 'JobsListUpdate', 'GetChoices',
|
||||||
|
'SchedulesListInit', 'SchedulesList'
|
||||||
];
|
];
|
||||||
@@ -485,7 +485,7 @@ ProjectsAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
|
|||||||
function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParams, ProjectsForm,
|
function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParams, ProjectsForm,
|
||||||
GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, Prompt,
|
GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, Prompt,
|
||||||
ClearScope, GetBasePath, ReturnToCaller, GetProjectPath, Authorization, CredentialList, LookUpInit, GetChoices,
|
ClearScope, GetBasePath, ReturnToCaller, GetProjectPath, Authorization, CredentialList, LookUpInit, GetChoices,
|
||||||
Empty, DebugForm, Wait, Stream, SchedulesControllerInit) {
|
Empty, DebugForm, Wait, Stream, SchedulesControllerInit, SchedulesListInit, SchedulesList) {
|
||||||
|
|
||||||
ClearScope('htmlTemplate');
|
ClearScope('htmlTemplate');
|
||||||
|
|
||||||
@@ -504,6 +504,18 @@ function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParam
|
|||||||
$scope.project_local_paths = [];
|
$scope.project_local_paths = [];
|
||||||
$scope.base_dir = '';
|
$scope.base_dir = '';
|
||||||
|
|
||||||
|
if ($scope.removerelatedschedules) {
|
||||||
|
$scope.removerelatedschedules();
|
||||||
|
}
|
||||||
|
$scope.removerelatedschedules = $scope.$on('relatedschedules', function() {
|
||||||
|
SchedulesListInit({
|
||||||
|
scope: $scope,
|
||||||
|
list: SchedulesList,
|
||||||
|
choices: null,
|
||||||
|
related: true
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
// After the project is loaded, retrieve each related set
|
// After the project is loaded, retrieve each related set
|
||||||
if ($scope.projectLoadedRemove) {
|
if ($scope.projectLoadedRemove) {
|
||||||
$scope.projectLoadedRemove();
|
$scope.projectLoadedRemove();
|
||||||
@@ -729,5 +741,5 @@ function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParam
|
|||||||
ProjectsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'ProjectsForm', 'GenerateForm',
|
ProjectsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'ProjectsForm', 'GenerateForm',
|
||||||
'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt', 'ClearScope',
|
'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt', 'ClearScope',
|
||||||
'GetBasePath', 'ReturnToCaller', 'GetProjectPath', 'Authorization', 'CredentialList', 'LookUpInit', 'GetChoices', 'Empty',
|
'GetBasePath', 'ReturnToCaller', 'GetProjectPath', 'Authorization', 'CredentialList', 'LookUpInit', 'GetChoices', 'Empty',
|
||||||
'DebugForm', 'Wait', 'Stream', 'SchedulesControllerInit'
|
'DebugForm', 'Wait', 'Stream', 'SchedulesControllerInit', 'SchedulesListInit', 'SchedulesList'
|
||||||
];
|
];
|
||||||
@@ -32,7 +32,7 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get
|
|||||||
if ($scope.removeParentLoaded) {
|
if ($scope.removeParentLoaded) {
|
||||||
$scope.removeParentLoaded();
|
$scope.removeParentLoaded();
|
||||||
}
|
}
|
||||||
$scope.removeScheduledLoaded = $scope.$on('ParentLoaded', function() {
|
$scope.removeParentLoaded = $scope.$on('ParentLoaded', function() {
|
||||||
// Add breadcrumbs
|
// Add breadcrumbs
|
||||||
LoadBreadCrumbs({
|
LoadBreadCrumbs({
|
||||||
path: $location.path().replace(/\/schedules$/,''),
|
path: $location.path().replace(/\/schedules$/,''),
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ angular.module('JobTemplateFormDefinition', ['SchedulesListDefinition', 'Complet
|
|||||||
collapse: true,
|
collapse: true,
|
||||||
collapseTitle: "Properties",
|
collapseTitle: "Properties",
|
||||||
collapseMode: 'edit',
|
collapseMode: 'edit',
|
||||||
collapseOpenFirst: false, //Always open first panel
|
collapseOpen: true, //Always open first panel
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
stream: {
|
stream: {
|
||||||
|
|||||||
Reference in New Issue
Block a user