|
41 | 41 | * </pre>
|
42 | 42 | */
|
43 | 43 |
|
44 |
| -const LOG_LEVEL = { |
45 |
| - debug: -1, |
46 |
| - info: 0, |
47 |
| - warning: 1, |
48 |
| - error: 2 |
49 |
| -}; |
| 44 | +const LOG_LEVEL = [ |
| 45 | + { |
| 46 | + debug: -1 |
| 47 | + }, { |
| 48 | + info: 0 |
| 49 | + }, { |
| 50 | + warning: 1 |
| 51 | + }, { |
| 52 | + error: 2 |
| 53 | + } |
| 54 | +]; |
50 | 55 | Object.freeze(LOG_LEVEL);
|
51 | 56 |
|
52 | 57 | qx.Class.define("qxapp.component.widget.logger.LoggerView", {
|
@@ -79,8 +84,9 @@ qx.Class.define("qxapp.component.widget.logger.LoggerView", {
|
79 | 84 | apply : "__applyFilters",
|
80 | 85 | nullable: false,
|
81 | 86 | check : "Number",
|
82 |
| - init: LOG_LEVEL.debug |
| 87 | + init: LOG_LEVEL[0].debug |
83 | 88 | },
|
| 89 | + |
84 | 90 | caseSensitive: {
|
85 | 91 | nullable: false,
|
86 | 92 | check : "Boolean",
|
@@ -115,14 +121,24 @@ qx.Class.define("qxapp.component.widget.logger.LoggerView", {
|
115 | 121 |
|
116 | 122 | const part = new qx.ui.toolbar.Part();
|
117 | 123 | const group = new qx.ui.form.RadioGroup();
|
118 |
| - for (let level in LOG_LEVEL) { |
| 124 | + let logLevelSet = false; |
| 125 | + for (let i=0; i<LOG_LEVEL.length; i++) { |
| 126 | + const level = Object.keys(LOG_LEVEL[i])[0]; |
| 127 | + const logLevel = LOG_LEVEL[i][level]; |
| 128 | + if (level === "debug" && !qxapp.data.Permissions.getInstance().canDo("study.logger.debug.read")) { |
| 129 | + continue; |
| 130 | + } |
119 | 131 | const label = level.charAt(0).toUpperCase() + level.slice(1);
|
120 | 132 | const button = new qx.ui.form.ToggleButton(label).set({
|
121 | 133 | appearance: "toolbar-button"
|
122 | 134 | });
|
123 |
| - button.logLevel = LOG_LEVEL[level]; |
| 135 | + button.logLevel = logLevel; |
124 | 136 | group.add(button);
|
125 | 137 | part.add(button);
|
| 138 | + if (!logLevelSet) { |
| 139 | + this.setLogLevel(logLevel); |
| 140 | + logLevelSet = true; |
| 141 | + } |
126 | 142 | }
|
127 | 143 | group.addListener("changeValue", e => {
|
128 | 144 | this.setLogLevel(e.getData().logLevel);
|
@@ -155,27 +171,29 @@ qx.Class.define("qxapp.component.widget.logger.LoggerView", {
|
155 | 171 | resizeBehavior.setWidth(0, "15%");
|
156 | 172 | resizeBehavior.setWidth(1, "85%");
|
157 | 173 |
|
| 174 | + this.__applyFilters(); |
| 175 | + |
158 | 176 | return table;
|
159 | 177 | },
|
160 | 178 |
|
161 | 179 | debug: function(who = "System", what = "") {
|
162 |
| - this.__addLog(who, what, LOG_LEVEL.debug); |
| 180 | + this.__addLog(who, what, LOG_LEVEL[0].debug); |
163 | 181 | },
|
164 | 182 |
|
165 | 183 | info: function(who = "System", what = "") {
|
166 |
| - this.__addLog(who, what, LOG_LEVEL.info); |
| 184 | + this.__addLog(who, what, LOG_LEVEL[1].info); |
167 | 185 | },
|
168 | 186 |
|
169 | 187 | infos: function(who = "System", whats = [""]) {
|
170 |
| - this.__addLogs(who, whats, LOG_LEVEL.info); |
| 188 | + this.__addLogs(who, whats, LOG_LEVEL[1].info); |
171 | 189 | },
|
172 | 190 |
|
173 | 191 | warn: function(who = "System", what = "") {
|
174 |
| - this.__addLog(who, what, LOG_LEVEL.warning); |
| 192 | + this.__addLog(who, what, LOG_LEVEL[2].warning); |
175 | 193 | },
|
176 | 194 |
|
177 | 195 | error: function(who = "System", what = "") {
|
178 |
| - this.__addLog(who, what, LOG_LEVEL.error); |
| 196 | + this.__addLog(who, what, LOG_LEVEL[3].error); |
179 | 197 | },
|
180 | 198 |
|
181 | 199 | __addLog: function(who = "System", what = "", logLevel = 0) {
|
@@ -246,7 +264,14 @@ qx.Class.define("qxapp.component.widget.logger.LoggerView", {
|
246 | 264 | },
|
247 | 265 |
|
248 | 266 | __addLevelColorTag: function(what, logLevel) {
|
249 |
| - const keyStr = String(qxapp.utils.Utils.getKeyByValue(LOG_LEVEL, logLevel)); |
| 267 | + let keyStr = "info"; |
| 268 | + for (let i=0; i<LOG_LEVEL.length; i++) { |
| 269 | + const level = Object.keys(LOG_LEVEL[i])[0]; |
| 270 | + if (LOG_LEVEL[i][level] === logLevel) { |
| 271 | + keyStr = level; |
| 272 | + break; |
| 273 | + } |
| 274 | + } |
250 | 275 | const logColor = qxapp.theme.Color.colors["logger-"+keyStr+"-message"];
|
251 | 276 | return ("<font color=" + logColor +">" + what + "</font>");
|
252 | 277 | },
|
|
0 commit comments