From 8773327f677132c3b65b04302124221a0dcd8fd5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 24 Nov 2022 19:43:18 +0100 Subject: [PATCH] Don't cherry-pick: - removed JFinancials-related files - renamed layout.css to custom.css as this is the new name - made local variable final, still code is broken here - changed missing references from JFinancials -> Addressbook --- .../AddressbookWebSessionBean.java | 2 +- web/WEB-INF/faces-config.xml | 10 +- web/WEB-INF/project-links.jsf.taglib.xml | 2 +- .../user/user_enter_current_password.tpl | 2 +- .../receipt/admin_receipt_edit.xhtml | 87 --- .../receipt/admin_receipt_list.xhtml | 531 ------------------ .../admin_receipt_item_edit.xhtml | 87 --- .../admin_receipt_item_list.xhtml | 497 ---------------- web/resources/css/{layout.css => custom.css} | 0 9 files changed, 4 insertions(+), 1214 deletions(-) delete mode 100644 web/admin/financial/receipt/admin_receipt_edit.xhtml delete mode 100644 web/admin/financial/receipt/admin_receipt_list.xhtml delete mode 100644 web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml delete mode 100644 web/admin/financial/receipt_item/admin_receipt_item_list.xhtml rename web/resources/css/{layout.css => custom.css} (100%) diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java index 9b053878..3655a42e 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java @@ -409,7 +409,7 @@ public class AddressbookWebSessionBean extends BaseAddressbookBean implements Ad try { // Then try to look it up - Addressbook addressbook = this.addressbookBean.getAddressbookById(this.getAddressbookId()); + final Addressbook addressbook = this.addressbookBean.getAddressbookById(this.getAddressbookId()); // Fire event here this.loadedEvent.fire(new AddressbookLoadedEvent(addressbook)); diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 10970fa6..cc753d73 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -11,7 +11,7 @@ @@ -940,14 +940,6 @@ /admin/business/opening_time/admin_opening_time_delete.xhtml - - /admin/financial/receipt_item/admin_receipt_item_edit.xhtml - - admin_list_receipt_items - /admin/financial/receipt_item/admin_receipt_item_list.xhtml - - - + diff --git a/web/admin/financial/receipt/admin_receipt_edit.xhtml b/web/admin/financial/receipt/admin_receipt_edit.xhtml deleted file mode 100644 index 6b2ce982..00000000 --- a/web/admin/financial/receipt/admin_receipt_edit.xhtml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml deleted file mode 100644 index 89afa08a..00000000 --- a/web/admin/financial/receipt/admin_receipt_list.xhtml +++ /dev/null @@ -1,531 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- -

-
- - - - - - - - -
-
-
-
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml deleted file mode 100644 index ab1855df..00000000 --- a/web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml deleted file mode 100644 index c986c129..00000000 --- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml +++ /dev/null @@ -1,497 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- -

-
- - - - - - - - -
-
-
-
diff --git a/web/resources/css/layout.css b/web/resources/css/custom.css similarity index 100% rename from web/resources/css/layout.css rename to web/resources/css/custom.css -- 2.39.5