1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

3514 Commits

Author SHA1 Message Date
Matthew Jones
bc78587c60 Remove an unneeded acl processor for job events in the socketio daemon 2014-12-10 15:00:15 -05:00
Jared Tabor
ec132ae151 Survey maker/taker html tag injection
Fixed a defect in which the user could inject html tags into the survey maker, which could in turn show up in survey taker.
2014-12-10 14:05:29 -05:00
Matthew Jones
6a162c2a3b Ansible folks say SIGINT works.... doesn't seem to stop the playbook to
me, but whatever
2014-12-10 13:44:30 -05:00
Jared Tabor
1268fb6191 Permissions form-type label
Changed the label for 'Deploy' from 'Deployment' to 'Job Template'
2014-12-10 12:07:23 -05:00
Jared Tabor
1641122737 Disable survey if 'can_edit' is false
The user should not be able to edit a survey if they do not have permission to edit the job template. I've added a check if the mode is 'edit' to see if the can_edit flag is false.
2014-12-10 11:53:05 -05:00
Matthew Jones
ff2c82ce72 Include the migration for the custom inventory script change to support
activity stream
2014-12-10 11:34:08 -05:00
Matthew Jones
017d42364b Add Custom Inventory Script to the activity stream from the api side 2014-12-10 11:33:22 -05:00
Matthew Jones
7df9ca8ae1 Force custom inventory scripts to start with a hashbang 2014-12-10 10:59:20 -05:00
Matthew Jones
b1b9fdede5 Fix a bug where, when launching a job without a credential and
subsequently supplying the credential we weren't able to pick up any ASK
fields that we needed credentials for
2014-12-10 10:42:20 -05:00
Jared Tabor
f7706c3808 Job Template form 'can_edit'
the 'Save' button should be disabled if the user does not have sufficient permissions to edit the job template
2014-12-10 10:37:09 -05:00
Matthew Jones
f62b9ff2c0 Switch to using SIGTERM for canceling a job 2014-12-10 10:34:18 -05:00
Jared Tabor
f121228d1a Project playbooks save issue
Fixed defect with project directory not saving for a manual project. Checked for creating/editing a project
2014-12-10 09:22:19 -05:00
Jared Tabor
b5e521a759 Survey maker
There was a discrepency between save states in the survey maker when creating a new job template. I had to make some changes to how we 'save' survey's when creating job templates. Now survey info is stored in a seperate object and then stored in the scope when the user clicks save. It used to all be stored in teh scope object.
2014-12-09 16:26:04 -05:00
Luke Sneeringer
a8390070c1 Explicitly typecast self.pk. 2014-12-09 13:29:55 -06:00
Matthew Jones
8afe8517fd Rename System Task to Management Job for UI consistency 2014-12-09 11:46:03 -05:00
Matthew Jones
d0498de00c Update job template deployment permission help text 2014-12-09 11:17:34 -05:00
Matthew Jones
3af2c181b8 Add can_edit field on job templates 2014-12-09 11:08:25 -05:00
Luke Sneeringer
9de1dc31f9 Identify the master by hostname. 2014-12-09 09:50:18 -06:00
Matthew Jones
572c1765cd Different strategy on the inventory script serializer, this should work
much better
2014-12-08 16:45:59 -05:00
Jared Tabor
5d6137c8a3 Add new inventory--empty source vars
The source variable parsing was out of date, and wasn't using the updated parser that I fixed to accept empty variables.
2014-12-08 16:41:23 -05:00
Jared Tabor
e10167ee5a Job Detail -- Events Summary
the edit icon for the host events was not receiving the correct host id during the processing of job_event data from the job_event endpoint
2014-12-08 16:16:39 -05:00
Matthew Jones
c04ac45296 Add a unique constraint on 'name' and 'organization' for the custom scripts 2014-12-08 15:49:45 -05:00
Matthew Jones
9b61956c9e Hide script contents if the user is not a super user 2014-12-08 15:10:16 -05:00
Matthew Jones
9a44f8eca8 Further tighten down socketio service 2014-12-08 14:41:48 -05:00
Jared Tabor
5daeed14c7 Inventory source tab fix for vmware inventory
Fixed an error with the vmware sourve variables not properly being instatiated once data is returned from the API
2014-12-08 14:17:28 -05:00
Matthew Jones
3d3cf2bb9e Make sure we include schedules as things that can be included when
creatinga  concrete job(any) from a job template, project update, or
inventory update
2014-12-08 14:03:16 -05:00
Jared Tabor
9f6230f7cc Portal job templates default sort by
Added 'noLink' option to the list view for the portal job templates, so that the list has a default sort-by option but does not contain links to other pages.
2014-12-08 13:34:50 -05:00
Jared Tabor
6d45dbbeb4 Default sort by w/ no link
set key and noLink to true, which will force the list to have a default sort-by, but will not force the list to contain any links
2014-12-08 13:33:35 -05:00
Jared Tabor
be63b3e0b3 adding 'noLink' property for list generators
adding noLink option which will override any other options to make a list column an href. This is useful when using the 'key' attribute, which sorts a list and includes links on the items. Now there is a way to override this feature. This is for portal mode and used in custom inv scripts as well.
2014-12-08 13:29:57 -05:00
Jared Tabor
8e28c73623 made organization required on custom inv script
the organization field of the custom inv script modal needed to have the astericks to indicate that it is required.
2014-12-08 12:52:07 -05:00
Jared Tabor
9e8ec0ebd0 Host events variable parsing to prevent tag inject
The host events modal needs to have escape characters for tag elements in case a user tries to inject html code into the arguements of the host events.
2014-12-08 12:28:38 -05:00
Jared Tabor
fd86b940e2 Prevent html injection in host events
replaced '<' and '>' characters with their escape characters to prevent html from being rendered onto the view.
2014-12-08 11:11:50 -05:00
Matthew Jones
e8a837ea11 Add a default maximum of 10 jobs waiting from a job template if launched
by a schedule
2014-12-08 10:51:43 -05:00
Matthew Jones
91527228db Demote settings imports in main utils 2014-12-05 15:47:25 -05:00
Matthew Jones
ec887f877f Support running custom inventory scripts (only) from within proot if enabled 2014-12-05 15:25:06 -05:00
Luke Sneeringer
d93870d828 Ability to remove instances. 2014-12-05 14:19:54 -06:00
Jared Tabor
1ffca45c4a Remove open modals when logging in
If the session times out, and the user attempts to open a modal dialog, then it must be closed due to the fact that bootstrap modals do not work with more than one modal open. The login modal is a bootstrap modal so all other modals need to be closed when it is shown.
2014-12-05 14:31:45 -05:00
Jared Tabor
9c80dba4a2 Survey maker type change fix
Made all custom fields set to pristine state when the user changes the question type
2014-12-05 12:21:09 -05:00
Jared Tabor
4a0afd97b0 Added org column to custom inv scripts list
I added the organization column to the custom inventory scripts list on the scripts modal
2014-12-05 11:32:28 -05:00
Jared Tabor
5eb4b59745 Projects form -> edit / SCM fix
The manual scm option was not showing up when editing an existing project
2014-12-05 11:06:34 -05:00
Jared Tabor
224e136269 Portal mode column styling
Added text wrap and fixed layout style for portal mode widgets for long names
2014-12-05 11:01:56 -05:00
Chris Church
688e80d82c One more extra vars fix. 2014-12-04 17:55:27 -05:00
Jared Tabor
b4be8f7d49 Project SCM type drop down fix
The SCM type for the projects page was broken when we sorted the drop down options by value. There was no value for 'manual' projects. I had to insert the word 'manual' where it was expecting a blank sting and then remove the word manual before saving the job template to the API
2014-12-04 15:56:35 -05:00
Chris Church
12f07e454f Reenable test for key=value extra vars, remove some unused imports. 2014-12-04 15:42:18 -05:00
Matthew Jones
680e382a40 Comment out an old vars test representation 2014-12-04 14:58:16 -05:00
Matthew Jones
d8c619554e Fix up some more issues with extra vars and unit tests 2014-12-04 14:25:36 -05:00
James Laska
a0bfe31847 Another attempt to correct markdown 2014-12-04 12:47:14 -05:00
James Laska
59ebc14f0d Correct markdown 2014-12-04 12:44:25 -05:00
Jared Tabor
c05d746d73 Fixed empty Extra Variable JSON parsing issue
if the user saved a job template with empty extra variables and the Parse as option as JSON, then the UI crapped out. I added a check to make sure the default string is '{}' if the user submits an empty field.
2014-12-04 12:01:05 -05:00
Matthew Jones
3164c6d356 Fix an issue where we weren't properly dealing with extra data passed as
survey answers when launching a job template
2014-12-04 11:17:24 -05:00