CORD GUI - Relabel url-filter levels OFF and NONE to NONE and ALL. (i.e. NONE allowed, or ALL allowed).
Change-Id: I48121f275f0815375bbbedd8fefd565a17d12d10
diff --git a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/UrlFilterFunction.java b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/UrlFilterFunction.java
index e26935d..ec1ff38 100644
--- a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/UrlFilterFunction.java
+++ b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/UrlFilterFunction.java
@@ -31,10 +31,10 @@
/**
* Denotes the URL filtering levels available. From most restrictive
- * to least restrictive. Note: <em>OFF</em> denies everything;
- * <em>NONE</em> allows everything.
+ * to least restrictive. Note: <em>NONE</em> allows nothing;
+ * <em>ALL</em> allows everything.
*/
- public enum Level { OFF, G, PG, PG_13, R, NONE }
+ public enum Level { NONE, G, PG, PG_13, R, ALL }
/**
* The default URL filtering level
diff --git a/apps/demo/cord-gui/src/main/webapp/app/data/pc_cats.json b/apps/demo/cord-gui/src/main/webapp/app/data/pc_cats.json
index 909d173..299fc13 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/data/pc_cats.json
+++ b/apps/demo/cord-gui/src/main/webapp/app/data/pc_cats.json
@@ -2,7 +2,7 @@
"_comment_": "Parental Control Categories - data file",
"level_order": [
- "OFF", "G", "PG", "PG_13", "R", "NONE"
+ "NONE", "G", "PG", "PG_13", "R", "ALL"
],
"category_order": [
@@ -110,7 +110,8 @@
},
"_prohibited_comment_": [
- "Note: Level OFF prohibits everything; level NONE prohibits nothing.",
+ "Note: Level NONE allows nothing (prohibits everything)",
+ " level ALL allows everything (prohibits nothing)",
" Levels G, PG, PG_13, R prohibitions listed below:"
],