Merge pull request #911 from MaximilianMeister/allow-nodes-index

MaximilianMeister · web-flow · commit 6bf973534f90 · 2016-12-19T16:17:38.000+01:00
upgrade: open index action during the upgrade
diff --git a/crowbar_framework/app/controllers/nodes_controller.rb b/crowbar_framework/app/controllers/nodes_controller.rb
@@ -16,6 +16,9 @@
 #
 
 class NodesController < ApplicationController
+  # allow node polling during the upgrade
+  skip_before_filter :upgrade, only: [:index]
+
   api :GET, "/nodes", "List all nodes and their status"
   header "Accept", "application/json", required: true
   example '

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`	`#`
`17`	`17`
`18`	`18`	`class NodesController < ApplicationController`
	`19`	`+ # allow node polling during the upgrade`
	`20`	`+ skip_before_filter :upgrade, only: [:index]`
	`21`	`+`
`19`	`22`	`api :GET, "/nodes", "List all nodes and their status"`
`20`	`23`	`header "Accept", "application/json", required: true`
`21`	`24`	`example '`