From 9ed77508a72fc7e998badfe670926d0cd4dbb385 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 23 May 2016 16:48:21 -0400 Subject: [PATCH 01/45] fix naming problem with ActivityStream logging --- awx/main/signals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/signals.py b/awx/main/signals.py index 64402953a0..f7b1845ae9 100644 --- a/awx/main/signals.py +++ b/awx/main/signals.py @@ -409,7 +409,7 @@ def activity_stream_associate(sender, instance, **kwargs): # If the m2m is from the User side we need to # set the content_object of the Role for our entry. if type(instance) == User and role.content_object is not None: - getattr(activity_entry, role.content_type.name).add(role.content_object) + getattr(activity_entry, role.content_type.name.replace(' ', '_')).add(role.content_object) activity_entry.role.add(role) activity_entry.object_relationship_type = obj_rel From 2b16c882f49bfa21b400db156f96b625859d223d Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Wed, 25 May 2016 12:45:13 -0400 Subject: [PATCH 02/45] fix infinite scrolling of job run standard out, resolves #1829 --- .../client/lib/lrInfiniteScroll/.bower.json | 32 + awx/ui/client/lib/lrInfiniteScroll/index.js | 2 + .../lib/lrInfiniteScroll/lrInfiniteScroll.js | 17 +- awx/ui/client/src/app.js | 1 + .../log/standard-out-log.controller.js | 39 +- .../log/standard-out-log.partial.html | 5 +- npm-shrinkwrap.json | 829 ++++++------------ 7 files changed, 311 insertions(+), 614 deletions(-) create mode 100644 awx/ui/client/lib/lrInfiniteScroll/.bower.json create mode 100644 awx/ui/client/lib/lrInfiniteScroll/index.js diff --git a/awx/ui/client/lib/lrInfiniteScroll/.bower.json b/awx/ui/client/lib/lrInfiniteScroll/.bower.json new file mode 100644 index 0000000000..7e27fd82a2 --- /dev/null +++ b/awx/ui/client/lib/lrInfiniteScroll/.bower.json @@ -0,0 +1,32 @@ +{ + "name": "lrInfiniteScroll", + "main": "lrInfiniteScroll.js", + "version": "1.0.0", + "homepage": "https://github.com/lorenzofox3/lrInfiniteScroll", + "authors": [ + "lorenzofox3 " + ], + "description": "angular directive to handle element scroll", + "keywords": [ + "angular", + "scroll", + "inifinite" + ], + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "_release": "1.0.0", + "_resolution": { + "type": "version", + "tag": "1.0.0", + "commit": "c833e9d8ff56d6c66e2a21ed7f27ad840f159a8b" + }, + "_source": "https://github.com/lorenzofox3/lrInfiniteScroll.git", + "_target": "~1.0.0", + "_originalSource": "lrInfiniteScroll" +} \ No newline at end of file diff --git a/awx/ui/client/lib/lrInfiniteScroll/index.js b/awx/ui/client/lib/lrInfiniteScroll/index.js new file mode 100644 index 0000000000..62f33e97b4 --- /dev/null +++ b/awx/ui/client/lib/lrInfiniteScroll/index.js @@ -0,0 +1,2 @@ +require('./lrInfiniteScroll'); +module.exports = 'lrInfiniteScroll'; diff --git a/awx/ui/client/lib/lrInfiniteScroll/lrInfiniteScroll.js b/awx/ui/client/lib/lrInfiniteScroll/lrInfiniteScroll.js index 3268a94081..ac29895c2b 100644 --- a/awx/ui/client/lib/lrInfiniteScroll/lrInfiniteScroll.js +++ b/awx/ui/client/lib/lrInfiniteScroll/lrInfiniteScroll.js @@ -2,13 +2,12 @@ 'use strict'; var module = ng.module('lrInfiniteScroll', []); - module.directive('lrInfiniteScroll', ['$log', '$timeout', function ($log, timeout) { + module.directive('lrInfiniteScroll', ['$timeout', function (timeout) { return{ link: function (scope, element, attr) { var lengthThreshold = attr.scrollThreshold || 50, timeThreshold = attr.timeThreshold || 400, - direction = attr.direction || 'down', handler = scope.$eval(attr.lrInfiniteScroll), promise = null, lastRemaining = 9999; @@ -20,14 +19,14 @@ handler = ng.noop; } - $log.debug('lrInfiniteScroll: ' + attr.lrInfiniteScroll); - element.bind('scroll', function () { - var remaining = (direction === 'down') ? element[0].scrollHeight - (element[0].clientHeight + element[0].scrollTop) : element[0].scrollTop; - // if we have reached the threshold and we scroll down - if ((direction === 'down' && remaining < lengthThreshold && (remaining - lastRemaining) < 0) || - direction === 'up' && remaining < lengthThreshold) { - //if there is already a timer running which has not expired yet we have to cancel it and restart the timer + var + remaining = element[0].scrollHeight - (element[0].clientHeight + element[0].scrollTop); + + //if we have reached the threshold and we scroll down + if (remaining < lengthThreshold && (remaining - lastRemaining) < 0) { + + //if there is already a timer running which has no expired yet we have to cancel it and restart the timer if (promise !== null) { timeout.cancel(promise); } diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 1fbd283e79..dddfdd52e2 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -79,6 +79,7 @@ __deferLoadIfEnabled(); var tower = angular.module('Tower', [ //'ngAnimate', + 'lrInfiniteScroll', 'ngSanitize', 'ngCookies', about.name, diff --git a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js index 631294255f..62fc00aee6 100644 --- a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js +++ b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js @@ -87,7 +87,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce }); function loadStdout() { - Rest.setUrl($scope.stdoutEndpoint + '?format=json&start_line=-' + page_size); + Rest.setUrl($scope.stdoutEndpoint + '?format=json&start_line=0&end_line=' + page_size); Rest.get() .success(function(data) { Wait('stop'); @@ -145,38 +145,17 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce }); } - $scope.stdOutScrollToTop = function() { - // scroll up or back in time toward the beginning of the file - var start, end, url; - if (loaded_sections.length > 0 && loaded_sections[0].start > 0) { - start = (loaded_sections[0].start - page_size > 0) ? loaded_sections[0].start - page_size : 0; - end = loaded_sections[0].start - 1; - } - else if (loaded_sections.length === 0) { - start = 0; - end = page_size; - } - if (start !== undefined && end !== undefined) { - $('#stdoutMoreRowsTop').fadeIn(); - url = stdout_url + '?format=json&start_line=' + start + '&end_line=' + end; + // lrInfiniteScroll handler + // grabs the next stdout section + $scope.stdOutGetNextSection = function(){ + if (current_range.absolute_end > current_range.end){ + var url = $scope.stdoutEndpoint + '?format=json&start_line=' + current_range.end + + '&end_line=' + (current_range.end + page_size); Rest.setUrl(url); Rest.get() - .success( function(data) { - //var currentPos = $('#pre-container').scrollTop(); - var newSH, oldSH = $('#pre-container').prop('scrollHeight'), - st = $('#pre-container').scrollTop(); - - $('#pre-container-content').prepend(data.content); - - newSH = $('#pre-container').prop('scrollHeight'); - $('#pre-container').scrollTop(newSH - oldSH + st); - - loaded_sections.unshift({ - start: (data.range.start < 0) ? 0 : data.range.start, - end: data.range.end - }); + .success(function(data){ + $('#pre-container-content').append(data.content); current_range = data.range; - $('#stdoutMoreRowsTop').fadeOut(400); }) .error(function(data, status) { ProcessErrors($scope, data, status, null, { hdr: 'Error!', diff --git a/awx/ui/client/src/standard-out/log/standard-out-log.partial.html b/awx/ui/client/src/standard-out/log/standard-out-log.partial.html index 247e58b165..45d9f70cbb 100644 --- a/awx/ui/client/src/standard-out/log/standard-out-log.partial.html +++ b/awx/ui/client/src/standard-out/log/standard-out-log.partial.html @@ -1,6 +1,5 @@ -
-
+
+
-