Merge branch 'release/0.20'0.20.0.0

Conflicts:
  config/general.yml-example

2 files changed, 22 insertions, 0 deletions

diff --git a/app/helpers/admin_public_body_category_helper.rb b/app/helpers/admin_public_body_category_helper.rb
new file mode 100644
index 000000000..9c5e5cc5e
--- /dev/null
+++ b/app/helpers/admin_public_body_category_helper.rb
@@ -0,0 +1,14 @@
+module AdminPublicBodyCategoryHelper
+    def heading_is_selected?(heading)
+        if params[:headings]
+            if params[:headings]["heading_#{heading.id}"]
+                return true
+            else
+                return false
+            end
+        elsif @category.public_body_headings.include?(heading)
+            return true
+        end
+        false
+    end
+end
diff --git a/app/helpers/health_checks_helper.rb b/app/helpers/health_checks_helper.rb
new file mode 100644
index 000000000..f5769a9ba
--- /dev/null
+++ b/app/helpers/health_checks_helper.rb
@@ -0,0 +1,8 @@
+module HealthChecksHelper
+
+    def check_status(check)
+        style = check.ok? ? {} : "color: red"
+        content_tag(:b, check.message, :style => style)
+    end
+
+end