aboutsummaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorXinhui Xu2017-11-30 11:09:36 +0100
committerGitHub2017-11-30 11:09:36 +0100
commita7930abe5a70b8b964af0dcbf86fe0a587ea98cb (patch)
treedc8e1a1ff57ff0328e4b8b2ac72932f82e379406 /app/helpers
parentfb7ad0e23e73954e6e5d172d61edb31cd686b8b4 (diff)
parent7b019504fd792293f1112b2375228505fab303fe (diff)
downloadchouette-core-a7930abe5a70b8b964af0dcbf86fe0a587ea98cb.tar.bz2
Merge branch 'master' into 4981_last_editor
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/compliance_check_sets_helper.rb14
-rw-r--r--app/helpers/networks_helper.rb7
2 files changed, 14 insertions, 7 deletions
diff --git a/app/helpers/compliance_check_sets_helper.rb b/app/helpers/compliance_check_sets_helper.rb
index fc7165fed..b255aee63 100644
--- a/app/helpers/compliance_check_sets_helper.rb
+++ b/app/helpers/compliance_check_sets_helper.rb
@@ -13,4 +13,18 @@ module ComplianceCheckSetsHelper
compliance_check.compliance_check_set,
compliance_check)
end
+
+ # Import statuses helper
+ def compliance_check_set_status(status)
+ if %w[new running pending].include? status
+ content_tag :span, '', class: "fa fa-clock-o"
+ else
+ cls =''
+ cls = 'success' if status == 'OK'
+ cls = 'warning' if status == 'WARNING'
+ cls = 'danger' if %w[ERROR IGNORED].include? status
+
+ content_tag :span, '', class: "fa fa-circle text-#{cls}"
+ end
+ end
end
diff --git a/app/helpers/networks_helper.rb b/app/helpers/networks_helper.rb
deleted file mode 100644
index b881ce078..000000000
--- a/app/helpers/networks_helper.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module NetworksHelper
-
- def source_type_name_label_pairs
- Chouette::Network.source_type_names
- .zip_map { |source_type_name| t("source_types.label.#{source_type_name}") }
- end
-end