Matthew Jones
82b692be9c
Merge remote-tracking branch 'origin/master' into celery-refactor
...
* origin/master: (28 commits)
AC-995 fixed typo and added extra error handling in case we actually cannot parse inventory variables. If that does happen, we now alert the user and keep the application stable and running.
Use supervisorctl when restarting celeryd on Ubuntu
Revert custom supervisor initscript
fix for the small viewport issue (https://www.dropbox.com/s/dmf4aixfv7k67cm/Screenshot%202014-01-29%2015.19.52.png ) where group name div gets pushed to a new line.
Fixed AS widget breadcrumb links
AC-977 Fixed raw html showing up in Action field on detail dialog. Added a subtitle on the AS widget. On inventory groups/host page the subtitle explains what activities are being displayed, and only activities realted to the selected group (on the inventory page) are displayed. If All Hosts selected, then all activities for all groups related to the current inventory are displayed. Also, brought back activity stream button for inventory hosts.
During AMI boot, use custom initscript name
Update tower-setup filename used in AMI build
AC-578 - Add custom supervisor initscript on ubuntu
Remove 'awx-' prefix when reporting version
Explicitly include the egg-info in rpm packaging
Fixing store references to point to http://www.ansible.com/ansible-pricing
Update make develop command, version check after package rename.
AC-992 Fix inventory import tests.
AC-967 Fixed job name in the host status fly-out. Text now wraps rather than extending beyond boundaries of pop-over. Removed status label- just show red/green dot. Clicking on ID or red/green dot shows the status dialog. When dialog closes the window.resize() watcher is restored.
AC-976 now using custom javascript to apply ellipsis to long group and host names. Fixed indes.html title.
Fix ansible-tower deb build
Rename package awx to ansible-tower
AC-976 add job template name to activity stream
AC-979 using activity stream object arrays correctly. AC-980 fixed Action label on detail dialog.
...
Conflicts:
awx/ui/static/js/controllers/Inventories.js
awx/ui/static/js/lists/InventoryHosts.js
awx/ui/static/js/widgets/Stream.js
2014-01-30 01:00:00 -05:00
Chris Houseknecht
168c4235f5
AC-977 Fixed raw html showing up in Action field on detail dialog. Added a subtitle on the AS widget. On inventory groups/host page the subtitle explains what activities are being displayed, and only activities realted to the selected group (on the inventory page) are displayed. If All Hosts selected, then all activities for all groups related to the current inventory are displayed. Also, brought back activity stream button for inventory hosts.
2014-01-29 17:00:04 -05:00
Chris Houseknecht
c18cb5a622
AC-976 add job template name to activity stream
2014-01-29 14:23:56 -05:00
Chris Houseknecht
dce52fc5ca
AC-979 using activity stream object arrays correctly. AC-980 fixed Action label on detail dialog.
2014-01-29 14:23:56 -05:00
Chris Houseknecht
f6638485b7
AC-985 edit now edit's inventory properties via dialog- using the same edit code already written for the wrench button on inventory->groups/hosts page.
2014-01-29 14:23:56 -05:00
Chris Houseknecht
e27ed61fc8
AC-983 long group names, AC-970 don't hightlight required fields in red, AC-966 fixed ansibleworks links to point to ansible, AC-733 new pagination widget, page and total rows.
2014-01-29 14:23:56 -05:00
Chris Houseknecht
7580b91186
AC-976 add job template name to activity stream
2014-01-28 18:47:46 -05:00
Chris Houseknecht
d57b2f7926
AC-979 using activity stream object arrays correctly. AC-980 fixed Action label on detail dialog.
2014-01-28 17:46:47 -05:00
Chris Houseknecht
7434bb8a9e
AC-985 edit now edit's inventory properties via dialog- using the same edit code already written for the wrench button on inventory->groups/hosts page.
2014-01-28 15:57:00 -05:00
Chris Houseknecht
cb8ec978de
AC-983 long group names, AC-970 don't hightlight required fields in red, AC-966 fixed ansibleworks links to point to ansible, AC-733 new pagination widget, page and total rows.
2014-01-28 01:03:09 -05:00
chris Houseknecht
7269c7bd06
Inventory refactor: add job status summary fly-out on host status. Click on a status and a second dialog appears for the specific job. Dialog can be resized and moved- built using jquery and styled to match TB dialog. Fixed home/groups and home/hosts pages to appear more inventory edit page. Home/groups page now allows you to start and inventory sync as well. Fixed tool-tip consistency. Click page forward/back now employs the spinner and should stop overclicking, which was resulting in page numbers < 0.
2014-01-22 04:53:32 -05:00
chris Houseknecht
2213268096
AC-940 user as ojbect1 or object2 now shows correctly in activity stream.
2014-01-20 19:25:58 -05:00
chris Houseknecht
8860b5c2ad
AC-951 Whenever the object name is not available or starts with '_delete' check for the name in changes.name. Also fixed server deep link issues between activity stream, home/group and home/inventory, and inventory.
2014-01-20 18:49:09 -05:00
chris Houseknecht
e5d148ac18
Activity Stream: clicking view detail no longer re-stringifies the changes JSON.
2014-01-20 13:50:30 -05:00
chris Houseknecht
8f5642e13e
Inventory refactor: fixed activity stream display on inventory edit page.
2014-01-20 13:34:11 -05:00
chris Houseknecht
aec5a2ba73
Activity stream: show detail will not be displayed if the selected activity cannot be found- this shouldn't happe, but just in case. Viewing detail no longer users an API call. Instead it retrieves the record from memory. It might be possible for this to break if the user clicks browser refresh. Inventory refactor: fixed drag-n-drop so that an object cannot be dropped onto two groups at the same time.
2014-01-17 13:02:46 -05:00
chris Houseknecht
fe40f3adf5
Activity Stream: fixed activity steam query build when called for specific objects. Fixed minor style issues.
2014-01-16 16:44:56 -05:00
chris Houseknecht
3a4899e04a
Activity Stream: Initiated by is now a link when actor is available. Refactored event detail view for much better use of space. Only thing left is formatting the json object.
2014-01-16 16:01:22 -05:00
chris Houseknecht
06abf29d50
Activity stream: implemented new search. Fixed a bunch of things related to the new data structure. Fixed /home/groups page.
2014-01-16 05:00:22 -05:00
Chris Church
2b7af0a2ec
Happy new year!!!
2014-01-02 11:51:43 -05:00
Chris Houseknecht
38e9dbcf3c
AC-691 fixed detail AS view so that JSON changes displays correctly. Fixed Refresh and AS buttons on Home page.
2013-11-21 01:16:15 +00:00
Chris Houseknecht
ade961fd38
AC-674 flash message is now cleared whenever AS is summoned.
2013-11-20 22:37:29 +00:00
Chris Houseknecht
94bbab566b
Only allow user with super_user access to see activity stream button. Fixed collision between is_superuser rootscope variable and credential.is_superuser on credential detail page. Added AS to user/n/permissions page.
2013-11-19 20:39:43 +00:00
Chris Houseknecht
4661a9e97a
Added AS to /inventories/hosts/N and /inventories/groups/N as well has /home/[groups, hosts]. Fixed CSS container sizing issue, so widget will not overlap footer.
2013-11-19 18:52:32 +00:00
Chris Houseknecht
6b418d4a5c
Added activity stream to all tabs and to the tab detail page. Enabled working breadcrumbs on the activity stream widget. Added round corners to th stream containers so it at least looks OK when the bottom occassionally overllapses footer. Adjusted the stream widget's default url to include detail object's primary key, limiting rows to the object being viewed.
2013-11-19 08:17:21 +00:00
Chris Houseknecht
735da6bff6
Related search now works with new search features. Only searches after user stops typing. Disables the input field while search is executing. Moved refresh button to the right side of list page. Fixed bugs: was using contains rather than icontains. Not sure that old refresh button worked. It does now.
2013-11-19 04:35:35 +00:00
Chris Houseknecht
3377927c00
Activity stream- completed modification to Rest lib. Fixed searches on activity stream allow search by object type and object name. Improved detail modal so that more of the changes box is visible. Moved search reset button to the right. There is now only one reset button per list, not one per filter widget.
2013-11-19 02:26:23 +00:00
Chris Houseknecht
1b224f64ac
Added support for many (unlimited) search widgets on a page. Activity widget now has 2 object search widgets. Adding a setHeader function to Rest.js library.
2013-11-18 20:03:32 +00:00
Chris Houseknecht
c720e5d51c
Search.js now supports up to 3 search filters on a page. First search widget can be regular or an object selector, which is used on the activity stream widget. Activity stream now has 2 filter widgets allowing a search to combine object and responsible user in a single query.
2013-11-18 08:16:51 +00:00
Chris Houseknecht
ce7688d252
Added 'working' spinner to all save/delete/select actions. This is to compensate for places where activity log is slowing down the API. AC-646 changes Rackspace credentials to show API Key in place of password. Fixed a bug on machine credential that caused username to not be passed to the API when adding and editing.
2013-11-17 06:37:34 +00:00
Chris Houseknecht
4b111d61c1
AC-611 Latest activity widget features. Tweaked current filter, but still does not include an object type. Added activty stream to Organization tab.
2013-11-15 16:28:54 +00:00
Chris Houseknecht
9505768bf6
First attempt at accessing /activity_stream. Modified /list/Stream.js to match the API and to start providing some of the translation we'll need.
2013-11-14 07:02:22 +00:00
Chris Houseknecht
5b2751c57f
Fixed parent container of activity stream setting the min-height value. This keeps the activity stream from overlapping the footer. Fixed groups page edit to not clear/empty the credential_name field.
2013-11-08 22:07:51 +00:00
Chris Houseknecht
5a3977495a
First iteration of Activity Stream. Added Home/Groups page. Increased icon size for icon-only buttons. Dashboard jobs widget- group and job links now work. Closed AC-621, AC-618.
2013-11-08 17:58:40 +00:00
