External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
3,873 Commits 65 Branches 102 Tags
7b38bacca0acc6b08b2aa9446546f5f36aeb40b9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jared Tabor 757e77e9a3 fixing jshint errors 2015-03-12 15:49:08 -04:00
Jared Tabor 333adea673 Merge branch 'edit-inv-page' into upstream_master 
Conflicts:
	awx/ui/static/js/controllers/Inventories.js
	awx/ui/static/js/lists/InventoryHosts.js
 2015-03-12 15:37:19 -04:00
Jared Tabor 5e22c86c45 link to manage page from inv list 2015-03-12 14:32:41 -04:00
Jared Tabor 698f2e7b8f Added icon on inventories view for manage inventory 
With the Manage Inventory page being essentially nested below the Edit Inventory page, I have added a new icon and a new button for getting to these pages.
 2015-03-12 12:16:47 -04:00
Jared Tabor 9ed89f9622 fixing breadcrumbs for new inventory page/manage 
fixing breadcrumbs to reflect the level of nesting of hte manage page.
 2015-03-12 11:41:36 -04:00
Jared Tabor c2b5d27333 Inventory manage row height and icon col width 
adjusted the heights of the rows for the groups/hosts on the manage view, and made the column width greater for icons on the page too
 2015-03-12 10:41:43 -04:00
Jared Tabor 8e91c36593 Inventory edit properties 
Adding the methods for filling the form with data from the API, resetting the form, saving variables, and for saving the form to the API. Also ensured activity stream worked.
 2015-03-11 18:14:50 -04:00
Jared Tabor 286fd04498 changing name of inv manage partial 2015-03-11 13:37:07 -04:00
Jared Tabor 42081077c5 Moving inventory pages 
the view that displayed the groups/hosts is now mapped to inventories/id/manage and the page for editing an inventory is an inventories/id
 2015-03-11 13:30:03 -04:00
Jared Tabor de3b1ecbc7 removing unnecessary files 2015-03-10 12:53:38 -04:00
Jared Tabor 7c9b6f5269 Making the status even smarter 
Incorporating the true status for each bar
 2015-03-10 12:04:14 -04:00
Jared Tabor 9295ac78fd Updated status checks for smart status 2015-03-10 11:28:48 -04:00
Jared Tabor 23254beb6c More styling on the tooltip for smart status 2015-03-10 10:57:35 -04:00
Jared Tabor ec39c5c864 Updated tooltip for sparklines 2015-03-09 16:55:17 -04:00
Jared Tabor 1e68785264 adding click event for spark lines 2015-03-09 13:48:08 -04:00
Jared Tabor df5f384916 Removing comment 2015-03-06 16:54:56 -05:00
Jared Tabor c3f5909600 removing comments from ansible-ui.less 2015-03-06 16:52:57 -05:00
Jared Tabor a8095e870e smart status sparkline tooltips 2015-03-06 16:32:58 -05:00
Jared Tabor 13bc0a7b78 changed the styling on the rows 2015-03-06 12:25:07 -05:00
Jared Tabor e653e9561a changed reconnect limit to a greater length 2015-03-03 16:56:09 -05:00
Jared Tabor 6087326bef socket disconnect on session timeout 
the UI was trying to reconnect to the socket server using the previous session's auth token. I'm forcing a disconnect now when the session times out and i added 'force new conection' to true in the socket configuration so that when a new session starts it doesn't use the old auth token.
 2015-03-03 15:01:02 -05:00
Jared Tabor 43dcd84fa7 First smart status commit with new files 
the smart status folder and main, controller, and directive
 2015-03-02 11:07:13 -05:00
Jared Tabor 727c2fcaf7 Changed JT form survey error message 2015-02-20 18:00:48 -05:00
Jared Tabor 614fe8e3fd fixing jshint warning 
unused params don't need to be included `
 2015-02-20 18:00:19 -05:00
Jared Tabor 2f00783f8c Changed the error message on JT for surveys 
On the job template form page we would display an error modal if the user had enabled a survey but not created one yet. Now we will use an error message on the form like we do in most other places.
 2015-02-20 14:03:20 -05:00
Jared Tabor db8eed2ae5 Job submission for optional survey questions 
Make sure optional multiselect and multiplechoice answers are ignored if not answered
 2015-02-19 12:59:09 -05:00
Jared Tabor 0286800ead Survey password field initialization 2015-02-19 12:58:41 -05:00
Jared Tabor ea8a537906 Job Submission extra vars 
When submitting a job to launch, the UI will collect extra_vars from the the JT. However with a recent change to make extra_vars include comments, the UI no longer receives the JT extra vars as a JSON obj, but rather as a yaml-unparsed string. So I am changing the way we parse these JT-extra_vars from 'json' to 'yaml' since we no longer expect to recieve a json-ified extra var object.
 2015-02-19 12:58:41 -05:00
Jared Tabor a0ffd50207 Adjust error messages for survey 
per Chris' request to make them more accurate.
 2015-02-18 16:00:47 -05:00
Jared Tabor a67b2e29b6 JSHint 
removed trailing whitespace
 2015-02-18 14:32:34 -05:00
Jared Tabor 6e18c6d3c0 fixed spelling error on websocket configs 
spelling changed from 'max reconneciton attemps' to 'max reconnection attempts'
 2015-02-18 11:23:50 -05:00
Jared Tabor 203de5221e Adding query string for websockets 
to pass the auth token instead of in the cookie
 2015-02-18 10:39:10 -05:00
Jared Tabor 50e174ea43 Remove stale error messages on survey 
when adding another question any stale errors messages need to be cleared.
 2015-02-17 18:25:04 -05:00
Jared Tabor a2121b7288 More accurate survey errors 
For the survey question form validation, some errors messages were being thrown for errors that hadn't occured.
 2015-02-17 17:52:54 -05:00
Jared Tabor dda00e98f5 Fixing job submission for textarea 
if textarea min is set to 0 and the question is optional, then the UI will pass the API and empty string to the job launch endpoint
 2015-02-17 16:09:14 -05:00
Jared Tabor 9fbd64805f Job Detail checks to prevent error messages 
If the job run completes before the JS can complete running, error messages are output to the js console. Ajusting checks to prevent errors happening.
 2015-02-16 13:42:38 -05:00
Jared Tabor e849dff386 Changed wording on survey error message 
Chris Wang found a wording issue with the survey error messages
 2015-02-16 12:13:40 -05:00
Jared Tabor 81ead8c85d Changed labels for filters on portal mode 
changed the labels to make things more aligned to the semantics of the actual filter.
 2015-02-16 12:11:11 -05:00
Jared Tabor 435b010f9f Changed $log.info to $log.debug 
we only want certain messages to post to the console when in debug mode
 2015-02-16 11:31:07 -05:00
Jared Tabor 1046ac075d Fixed spelling error on survey 
accidentally spelled 'scope' -> 'scopt'
 2015-02-16 11:01:54 -05:00
Jared Tabor 50e44def7b added missing } 
oops
 2015-02-13 15:59:05 -05:00
Jared Tabor c30d4c70ad Fixed data min/max/default check for survey 2015-02-13 14:48:30 -05:00
Jared Tabor f46a34e079 Adding Password option for survey's 
I'm adding the UI side of the password option for surveys, which should show up in the job summary as a masked string.
 2015-02-13 14:00:00 -05:00
Jared Tabor 6a77c5dbab Added metric for cache timeout on project page 
For cache timeout on the project form page, I've added the metric in seconds to the field label
 2015-02-04 17:00:58 -05:00
Jared Tabor 1e521e43c2 Auth timeout on survey edit 
The UI would error out on the console
 2015-02-04 16:16:16 -05:00
Jared Tabor 7788d45088 Removing the Launch and Sync button 
removing the launch button from the JT form page and the sync project from the project page
 2015-02-04 14:28:31 -05:00
Jared Tabor 5116e41433 adding comments to survey code 
helps with refactoring
 2015-02-04 11:34:55 -05:00
Jared Tabor 2a5f904283 Adding extra dependency reference for awToolTip 
the awToolTip directive has a dependency on the $sce (context escaping) service, and I had incorrectly defined this reference in an earlier commit.
 2015-02-03 14:35:39 -05:00
Jared Tabor 3d07e09aeb More escaping of malicious html/js in Activity Stream 
I had to move the escaping functions to happen earlier in the URL creation for activity streams
 2015-02-03 14:02:21 -05:00
Jared Tabor 61e2683f57 Added 'About Tower' to portal mode acct menu 
we decided not to add Account Settings for now.
 2015-02-03 12:24:28 -05:00
Jared Tabor f914482e19 Changed 'Cleanup Job' to name of cleanup job ran 
on the modal that prompts the user for number of days of data to keep, I changed the title of the modal to say the name of the job being run.
 2015-02-02 20:58:49 -05:00
Jared Tabor 57e2548265 Added escaping for Add JT -> create survey 
the service for the escaping for the html was not included in the JT add function
 2015-02-02 10:24:34 -05:00
Jared Tabor 208e08410f Websocket would connect before login 
The websockets would make a connection before login when the user refreshes the login page. I believe this was happening on upgrade too.
 2015-01-30 16:02:37 -05:00
Jared Tabor 2a556ecab6 removing extra socket connection call in auth 
this line was causing the socket connection to happen before the user logs in after a session timeout
 2015-01-30 11:48:45 -05:00
Jared Tabor 7408387826 XSS character escaping for tooltips 
I've added character escaping for tooltips to avoid XSS security breaches
 2015-01-29 16:19:40 -05:00
Jared Tabor 71eaa5aa2a XSS character escaping for activity stream 
The activity stream widget needed the XSS character escaping
 2015-01-29 15:26:07 -05:00
Jared Tabor 2cc84f8bdd XSS fix: serialize survey question default answer 
For the XSS issues that we found, I am serializing the default answers now to make sure all appropriate characters are escaped.
 2015-01-29 11:22:32 -05:00
Jared Tabor 0d8a2a0d82 Permissions page -> JT 'Create' 
The permissions page, when saved with 'Create' JT permissions wouldn't re-fill the form correctly when the user renavigates to the edit form page for that permission.
 2015-01-28 11:02:09 -05:00
Jared Tabor 1123baafe7 EULA Update Submit button ngdisable 
Added ng-disabled to make submit button on EULA update disabled if checkbox AND json editor are filled out by user.
 2015-01-27 22:35:38 -05:00
Jared Tabor 96ae4baced Adding EULA text for fresh Tower install 
The EULA text needed to be added for when a new user needs to input a tower license for the first time.
 2015-01-27 17:54:42 -05:00
Jared Tabor 280126310a Adding filter on portal jobs for user/team 
Feature request from Bill for the jobs view of portal mode to be filterable for users/teams
 2015-01-27 16:15:13 -05:00
Jared Tabor 582bca474c Adding filter on portal jobs for user/team 
Feature request from Bill for the jobs view of portal mode to be filterable for users/teams
 2015-01-27 14:31:28 -05:00
Jared Tabor b530538b03 JSHint errors. 
cleaned up some errors from jmitchell
 2015-01-23 11:59:35 -05:00
Jared Tabor c02e5ffa41 Adding EULA checkbox in license modal 
Added the EULA text and checkbox on the UI. We received the shortened text from Rob Nalen
 2015-01-23 11:59:07 -05:00
Jared Tabor 7e822c34d5 Fixed issue with permissions for admins 
When I added the callback for the CheckAccess module, I forgot to add the callback for whether the user is an admin (already added for non-admin users)
 2015-01-21 18:01:33 -05:00
Jared Tabor 0bf3d54095 JSHint errors 
fixed some JSHint errors from the prompt dialog commit
 2015-01-21 18:00:25 -05:00
Jared Tabor f9af559379 Preventing delete modal from tabbing 
There is an open issue with bootstrap modals where they do not prevent tabbing in the background of a modal. I've had to add some custom behavior to prevent this.
 2015-01-21 17:38:31 -05:00
Jared Tabor 91e3374c2d Adding check for job detail properties 2015-01-19 12:08:53 -05:00
Jared Tabor ce9e82d50b Added help text for custom inv script 
added a line for the user to add the hashbang in their script
 2015-01-19 11:03:18 -05:00
Jared Tabor aae9e2c14b error handling in Job Detail page 
a JS error can get thrown if the user navigates to the job detail page as a job is ending
 2015-01-16 16:07:23 -05:00
Jared Tabor e49159af00 License -> 0 days 
0 days needs to be plural
 2015-01-16 14:26:14 -05:00
Jared Tabor 6d10e31ea8 fixed Firefox error for submitting survey question 
hadn't passed the 'event' object as part of hte ng-click event
 2015-01-16 12:47:30 -05:00
Jared Tabor d8af3198fc changed opacity on survey maker action buttons 
had to change some of the css/div classes
 2015-01-16 12:00:20 -05:00
Jared Tabor eccd25e30c CheckAccess callback 
adjusted the callback of hte check access module. changed it to happen after successful REST call.
 2015-01-15 11:34:15 -05:00
Jared Tabor c169b40169 Changed license to say '1 day' 
license read '1 Days' remaining. I changed this to '1 Day'
 2015-01-15 11:21:53 -05:00
Jared Tabor b5929a232a Machine Credential username/password 
changed username/password for machine credential to NOT include 'SSH'
 2015-01-13 14:50:35 -05:00
Jared Tabor 34afc9cd02 JSHint 
fixed lint error
 2015-01-12 17:45:37 -05:00
Jared Tabor 7f8fff18a0 Permissions for org admin 
The series of events for checking a user's access level was happening out of order for loading the permissions page/form. I added a callback so that the access level can be checked first and then a secondary action (like filling a form as readonly or not) could happen next.
 2015-01-12 17:37:37 -05:00
Jared Tabor 8e8a125776 Adjusted Variable parsing 
had to change variable parsing to a nested variable object but to not accept something like : "jenkins_uri: {{ ansible_ssh_host }}"
 2015-01-12 14:21:52 -05:00
Jared Tabor 40764aaa18 Updated copyright to 2015 
on cowsay about modal window
 2015-01-08 09:44:48 -05:00
Jared Tabor bd12efd7fe Radio button on modal window 
fixed a lookup modal from having checkboxes when it needed radio buttons
 2015-01-08 09:43:15 -05:00
Jared Tabor 94b0a62059 Double click issue on radio button 
The custom inventory script radio button when choosing a custom script under Inventory->Group->Source had to be clicked 2x in order to select a desired radio button. Fixed this issue. Had to rename the list iterator to 'source_script'
 2015-01-08 09:39:41 -05:00
Jared Tabor b7a85f7f3c Job submission 
had to adjust the job submission to correctly pass empty strings for extra vars and for survey questions
 2015-01-07 10:49:58 -05:00
Jared Tabor 9848a37b02 Force user to login before opening web sockets 
Rearranged the series of events so that the socket handshake happens after the user logs in.
 2015-01-06 17:00:22 -05:00
Jared Tabor 9c3b3aab90 Variable parsing 
expanded the variable parsing to disregard an empty string inside of an empty string ("\"\"")
 2015-01-06 12:54:34 -05:00
Jared Tabor 5e2f915236 Socket reconnection logic 
To test the socket reconnection logic, i've increased the number of times the UI will attempt to try and connect to the socket url.
 2015-01-06 11:30:24 -05:00
Jared Tabor 7d63f1dbf0 Socket.js error message 
I've added an error message to be posted to the javascript console anytime the socket service has an error. This should help in debugging issues down the line.
 2015-01-06 10:22:44 -05:00
Jared Tabor 6fccee404a Job Submission 
The job submission should NOT send an empty extra_vars dict if no extra variable are collected as a result of the job submission prompts. I was under the impression that an empty extra vars dict would be disregarded. An empty extra_vars dict will in fact overwrite any extra_vars in the JT with a blank set of extra_vars
 2015-01-05 18:27:35 -05:00
Jared Tabor 5d5213ba4c Socket.js 
removing 'force new connection' line again
 2015-01-05 16:07:36 -05:00
Jared Tabor f6baacfbe2 Socket.js 
adding 'force new connection' line back into socket file
 2015-01-05 11:14:40 -05:00
Jared Tabor a2b5c38436 Typo on survey help 2015-01-05 09:40:30 -05:00
Jared Tabor b0c9845bc3 Survey maker prevent duplicate vars 
Added check in survey maker to prevent saving a question that uses a variable that is already in use.
 2014-12-19 14:28:38 -05:00
Jared Tabor 54465d4b31 Socket.js 
removing the line i added for the security patch per Matt's request
 2014-12-19 14:22:13 -05:00
Jared Tabor c7c25250a7 Dashboard host count graph 
Pie chart tooltip wasn't displaying values with commas properly
 2014-12-19 13:57:22 -05:00
Jared Tabor e41de1684c Job Template form survey check 
The job template form wasn't checking for survey in every scenario
 2014-12-19 12:18:23 -05:00
Jared Tabor 05ff0a14a4 Job submission 
if survey is enabled and not prompting for extra vars then get the extra vars from the job template
 2014-12-19 12:05:09 -05:00
Jared Tabor cd486b6d9a Job detail page 
When the job run was complete the interval was not being turned off that would continue to update the DOM
 2014-12-18 16:29:14 -05:00
Jared Tabor f5100ee110 Cleanup tower modal issue between saves 
cleaned up the management modal between states
 2014-12-18 14:25:41 -05:00
Jared Tabor 50372f9c38 Prompt for credentials 
fixed prompt for credentials so that ssh and ssh key unlock were both accounted for
 2014-12-18 10:52:53 -05:00
Jared Tabor be2f2596f3 Made delete prompts use the same styling 
made the delete prompts more uniform
 2014-12-17 17:49:45 -05:00