홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
b13c8f10 1 parent d01a23df

CORD GUI - Relabel url-filter levels OFF and NONE to NONE and ALL. (i.e. NONE al… 

…lowed, or ALL allowed).

Change-Id: I48121f275f0815375bbbedd8fefd565a17d12d10
Inline Side-by-side
Showing 2 changed files with 6 additions and 5 deletions
...@@ -31,10 +31,10 @@ public class UrlFilterFunction extends DefaultXosFunction { ...@@ -31,10 +31,10 @@ public class UrlFilterFunction extends DefaultXosFunction {
31 31
32 /** 32 /**
33 * Denotes the URL filtering levels available. From most restrictive 33 * Denotes the URL filtering levels available. From most restrictive
34 - * to least restrictive. Note: <em>OFF</em> denies everything; 34 + * to least restrictive. Note: <em>NONE</em> allows nothing;
35 - * <em>NONE</em> allows everything. 35 + * <em>ALL</em> allows everything.
36 */ 36 */
37 - public enum Level { OFF, G, PG, PG_13, R, NONE } 37 + public enum Level { NONE, G, PG, PG_13, R, ALL }
38 38
39 /** 39 /**
40 * The default URL filtering level 40 * The default URL filtering level
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 "_comment_": "Parental Control Categories - data file", 2 "_comment_": "Parental Control Categories - data file",
3 3
4 "level_order": [ 4 "level_order": [
5 - "OFF", "G", "PG", "PG_13", "R", "NONE" 5 + "NONE", "G", "PG", "PG_13", "R", "ALL"
6 ], 6 ],
7 7
8 "category_order": [ 8 "category_order": [
...@@ -110,7 +110,8 @@ ...@@ -110,7 +110,8 @@
110 }, 110 },
111 111
112 "_prohibited_comment_": [ 112 "_prohibited_comment_": [
113 - "Note: Level OFF prohibits everything; level NONE prohibits nothing.", 113 + "Note: Level NONE allows nothing (prohibits everything)",
114 + " level ALL allows everything (prohibits nothing)",
114 " Levels G, PG, PG_13, R prohibitions listed below:" 115 " Levels G, PG, PG_13, R prohibitions listed below:"
115 ], 116 ],
116 117
......