When tagging in explorer store session after getView as well

getView changes current @edit object, but we need to preserve it same as is in session, so restore @edit from session so tagging in explorer does not throw any error
ManageIQ · Jan 5, 2017 · 6dfe568 · 6dfe568
1 parent c7f2fd2
commit 6dfe568
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/assets/javascripts/controllers/report_data_controller.js b/app/assets/javascripts/controllers/report_data_controller.js
@@ -249,8 +249,9 @@
   ReportDataController.prototype.movePagination = function() {
     setTimeout(function() {
       var pagination = document.getElementsByClassName('miq-pagination');
-      if (pagination && pagination.length > 0) {
-        document.querySelector('#paging_div .col-md-12').appendChild(pagination[0])
+      var pagind_div = document.querySelector('#paging_div .col-md-12');
+      if (pagination && pagination.length > 0 && pagind_div) {
+        pagind_div.appendChild(pagination[0])
       }
     });
   }

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -331,6 +331,7 @@ def report_data
     current_view, settings = get_view(model_view, options)
     settings[:sort_dir] = @sortdir unless settings.nil?
     settings[:sort_col] = @sortcol unless settings.nil?
+    @edit = session[:edit]
     render :json => {
       :settings => settings,
       :data     => view_to_hash(current_view),

diff --git a/tools/ci/before_install.sh b/tools/ci/before_install.sh
@@ -1,6 +1,6 @@
 set -e
 
-git clone https://github.com/ManageIQ/manageiq.git --branch master --depth 1 spec/manageiq
+git clone https://github.com/karelhala/manageiq.git --branch report_data --depth 1 spec/manageiq
 
 cd spec/manageiq
 source tools/ci/setup_vmdb_configs.sh