zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-197 removed enableTouchExit attribute from GUI

Browse source
This commit is contained in:
anhefti 2021-06-17 22:07:24 +02:00
parent ee0960602c
commit 73f8ab23bf
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/rules/BrowserViewModeRule.java
View file

@ -30,7 +30,6 @@ public class BrowserViewModeRule implements ValueChangeRule {
private static final Logger log = LoggerFactory.getLogger(BrowserViewModeRule.class); private static final Logger log = LoggerFactory.getLogger(BrowserViewModeRule.class);
public static final String KEY_BROWSER_VIEW_MODE = "browserViewMode"; public static final String KEY_BROWSER_VIEW_MODE = "browserViewMode";
public static final String KEY_TOUCH_EXIT = "enableTouchExit";
public static final String KEY_MAIN_WINDOW_GROUP = "mainBrowserWindowWidth"; public static final String KEY_MAIN_WINDOW_GROUP = "mainBrowserWindowWidth";
public static final String KEY_TOUCH_OPTIMIZED = "touchOptimized"; public static final String KEY_TOUCH_OPTIMIZED = "touchOptimized";
@ -53,14 +52,11 @@ public class BrowserViewModeRule implements ValueChangeRule {
if (KEY_TOUCH_OPTIMIZED.equals(attribute.name)) { if (KEY_TOUCH_OPTIMIZED.equals(attribute.name)) {
if (BooleanUtils.toBoolean(value.value)) { if (BooleanUtils.toBoolean(value.value)) {
context.setValue(KEY_BROWSER_VIEW_MODE, "2"); context.setValue(KEY_BROWSER_VIEW_MODE, "2");
context.enable(KEY_TOUCH_EXIT);
context.disableGroup(KEY_MAIN_WINDOW_GROUP); context.disableGroup(KEY_MAIN_WINDOW_GROUP);
} else { } else {
if (context.getValue(KEY_BROWSER_VIEW_MODE) == null) { if (context.getValue(KEY_BROWSER_VIEW_MODE) == null) {
context.setValue(KEY_BROWSER_VIEW_MODE, "0"); context.setValue(KEY_BROWSER_VIEW_MODE, "0");
} }
context.setValue(KEY_TOUCH_EXIT, Constants.FALSE_STRING);
context.disable(KEY_TOUCH_EXIT);
} }
return; return;
@ -72,7 +68,6 @@ public class BrowserViewModeRule implements ValueChangeRule {
if (!context.getValue(KEY_TOUCH_OPTIMIZED).equals(Constants.FALSE_STRING)) { if (!context.getValue(KEY_TOUCH_OPTIMIZED).equals(Constants.FALSE_STRING)) {
context.setValue(KEY_TOUCH_OPTIMIZED, Constants.FALSE_STRING); context.setValue(KEY_TOUCH_OPTIMIZED, Constants.FALSE_STRING);
} }
context.disable(KEY_TOUCH_EXIT);
context.enableGroup(KEY_MAIN_WINDOW_GROUP); context.enableGroup(KEY_MAIN_WINDOW_GROUP);
break; break;
} }
@ -80,7 +75,6 @@ public class BrowserViewModeRule implements ValueChangeRule {
if (!context.getValue(KEY_TOUCH_OPTIMIZED).equals(Constants.FALSE_STRING)) { if (!context.getValue(KEY_TOUCH_OPTIMIZED).equals(Constants.FALSE_STRING)) {
context.setValue(KEY_TOUCH_OPTIMIZED, Constants.FALSE_STRING); context.setValue(KEY_TOUCH_OPTIMIZED, Constants.FALSE_STRING);
} }
context.disable(KEY_TOUCH_EXIT);
context.disableGroup(KEY_MAIN_WINDOW_GROUP); context.disableGroup(KEY_MAIN_WINDOW_GROUP);
break; break;
} }

5
src/main/resources/config/sql/base/V9__touchExit_v1_2.sql Normal file
View file

@ -0,0 +1,5 @@
-- -----------------------------------------------------
-- Remove all enableTouchExit attributes (9) from orientation
-- -----------------------------------------------------
DELETE FROM `orientation` WHERE `config_attribute_id`=9;
UPDATE orientation SET width=7 WHERE config_attribute_id=8;