Commit c082628a by Tuomas Riihimäki

Remove old actionlog/messagelist page reference, which gives a nullpointer in adminview

1 parent 1edf8ff4
...@@ -41,7 +41,7 @@ public class BootstrapBean implements BootstrapBeanLocal { ...@@ -41,7 +41,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
"ALTER TABLE org_roles ADD ldap_weight integer NOT NULL default 100" "ALTER TABLE org_roles ADD ldap_weight integer NOT NULL default 100"
}); });
// barcodefuckup // barcodefuckup
dbUpdates.add(new String[] { dbUpdates.add(new String[] {
"DROP TABLE card_barcode", "DROP TABLE card_barcode",
"ALTER TABLE printed_cards DROP COLUMN barcode;", "ALTER TABLE printed_cards DROP COLUMN barcode;",
"ALTER TABLE printed_cards DROP COLUMN rfid_uid;", "ALTER TABLE printed_cards DROP COLUMN rfid_uid;",
...@@ -53,6 +53,11 @@ public class BootstrapBean implements BootstrapBeanLocal { ...@@ -53,6 +53,11 @@ public class BootstrapBean implements BootstrapBeanLocal {
"ALTER TABLE reader_events ALTER COLUMN type DROP DEFAULT;", "ALTER TABLE reader_events ALTER COLUMN type DROP DEFAULT;",
}); });
dbUpdates.add(new String[] {
"delete from menu_navigation where item_id in (select id from menuitem where url in ( '/actionlog/messagelist'))",
"delete from menuitem where url in ('/actionlog/messagelist')",
});
} }
@EJB @EJB
...@@ -78,7 +83,8 @@ public class BootstrapBean implements BootstrapBeanLocal { ...@@ -78,7 +83,8 @@ public class BootstrapBean implements BootstrapBeanLocal {
throw new RuntimeException("Sanity check failed! DB is newer than the codebase!"); throw new RuntimeException("Sanity check failed! DB is newer than the codebase!");
} }
} else { } else {
// DB is up to date by default! We need to mark the current version down though. // DB is up to date by default! We need to mark the current version
// down though.
dBm = new DBModel(); dBm = new DBModel();
dBm.setRevision(upIdx); dBm.setRevision(upIdx);
dbModelFacade.create(dBm); dbModelFacade.create(dBm);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!