From 8beae12f5fcf423ed42c950ae0e6956d742ee9bd Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 14 Oct 2015 11:55:18 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20stuff=20for=20user=20li?= =?utf8?q?st=20-=20renamed=20message=20keys=20-=20updated=20jar(s)=20Signe?= =?utf8?q?d-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/juser-lib.jar | Bin 3844 -> 3931 bytes .../addressbook/beans/user/UserWebBean.java | 13 +++++++++++++ .../beans/user/UserWebController.java | 8 ++++++++ .../localization/bundle_de_DE.properties | 6 ++++-- .../localization/bundle_en_US.properties | 6 ++++-- web/login/login_own_addressbooks.xhtml | 2 +- web/login/login_shared_addressbooks.xhtml | 2 +- web/login/login_user_list.xhtml | 9 ++++++++- 8 files changed, 39 insertions(+), 7 deletions(-) diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar index 58f2ee90b29321699f2f266df483624bbb90532d..8baa23438388e930056991e3fedbe68cfe3603d1 100644 GIT binary patch delta 814 zcmZpXyDi5X;LXg!#lXP9z>pp1H<4FEFe}c_{jf;-+;j#81`rmR+{Z0GG1gezgqO>? zC^fMpHAUB{(n`Tl&s@(S-pqXB26bkT)?4ym>W>D9nyk)f1g2vcEx`12MmsQlgV7O8 z%P`r3=*=-qyv$%m4l6q|FHpqYxp$+>5hezPBa<6Ae5J+N8AR9_MA;d{7#a8yb8-So zlX5bXLyJ?3iYNPWDl^(lF60!R{E=0i$@PXCwgJ_^$0Wc}ZAOxh@fF=qvFa&rrGKnz5L(Ls1 z0|%Tyizj<KC+ap2TFplGh7P;!;(ffh!)w&cbF9>@8e*b z%)!T_0J6nTRk^O5CB{t BjOhRX delta 616 zcmcaD*CNLo;LXg!#lXP9z`)e*JCRp|m$BW~-FB14qXGs7hJuMsehOy1T+T(Qi6yBi zx=xi=3Wj-H~5VPaqaVcW@yOsbO?aHw#JvNH&=GYGRY zh)lNUteE_eLvizV&P>KQRu)DE76w)Z1|ZGGz|O!3@(KeJ11FHrg~sP*-~p@S1<^n? zd|;BFK>$dz0d)#8Fa&rrGKnz517va^w*_j5Ouo!*3ibdukF@w%pvL^7bbWMPwmi~| z?Eug<2y H4Uz)@yw-ND diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java index 09db6e22..9aaa709a 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java @@ -193,6 +193,11 @@ public class UserWebBean implements UserWebController { */ private Integer zipCode; + /** + * A list of all public user profiles + */ + private List publicUserList; + /** * Default constructor */ @@ -648,6 +653,9 @@ public class UserWebBean implements UserWebController { // Get full email address list for reducing EJB calls this.emailAddressList = this.userBean.getEmailAddressList(); + + // Initialize user list + this.publicUserList = this.userBean.allPublicUsers(); } @Override @@ -655,6 +663,11 @@ public class UserWebBean implements UserWebController { return ((this.emailAddressList instanceof List) && (this.emailAddressList.contains(user.getUserContact().getContactEmailAddress()))); } + @Override + public boolean isPublicUserRegistered () { + return ((this.publicUserList instanceof List) && (!this.publicUserList.isEmpty())); + } + @Override public boolean isRequiredPersonalDataSet () { return ((this.getUserName() != null) diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java index 2d88e45e..f5df38c9 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java @@ -430,4 +430,12 @@ public interface UserWebController extends Serializable { * @return Whether it is already used */ public boolean isUserNameRegistered (final User user); + + /** + * Checks whether a public user account is registered. This means that at + * least one user profile has its flag "public user profile" enabled. + *

+ * @return Whether at least one user has a public profile + */ + public boolean isPublicUserRegistered (); } diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 1a87bd56..7b2d9d28 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -157,7 +157,7 @@ GUEST_YES_READ_TERMS_CONDITIONS_2=gelesen und verstanden und nehme sie hiermit a TERMS_CONDITIONS=Allgemeine Gesch\u00e4ftsbestimmungen PAGE_TITLE_LOGIN_AREA=Benuzterbereich TABLE_HEADER_LIST_OWN_ADDRESSBOOKS=Meine eigenen Adressb\u00fccher: -TABLE_SUMMARY_LIST_OWN_ADDRESSBOOKS=Diese Tabelle listet alle von Ihnen angelegten Adressb\u00fccher sortiert nach Id-Nummer auf. +TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS=Diese Tabelle listet alle von Ihnen angelegten Adressb\u00fccher sortiert nach Id-Nummer auf. LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK=Weiteres Adressbuch hinzuf\u00fcgen LINK_LOGIN_ADD_FIRST_ADDRESSBOOK=Erstes Adressbuch anlegen LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE=Legen Sie ein weiteres Adressbuch an. So organisieren Sie Ihre Kontakte besser. @@ -196,5 +196,7 @@ PAGE_TITLE_LOGIN_SHARED_ADDRESSBOOKS=Mit anderen geteilte Adressb\u00fccher CONTENT_TITLE_LOGIN_SHARED_ADDRESSBOOKS=Meine mit anderen Benutzern geteilte Adressb\u00fccher: LINK_LOGIN_START_SHARING_ADDRESSBOOKS=Jetzt Ihre Adressb\u00fccher mit anderen Mitgliedern teilen! LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS=Meine mit anderen Benutzern geteilte Adressb\u00fccher -TABLE_SUMMARY_SHARED_ADDRESSBOOKS=Diese Tabelle listed alle von Ihnen mit anderen Benutzern geteilte Adressb\u00fccher auf. +TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS=Diese Tabelle listed alle von Ihnen mit anderen Benutzern geteilte Adressb\u00fccher auf. LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS=Derzeit teilen Sie keine Adressb\u00fccher mit anderen Benutzern. +LOGIN_TABLE_HEADER_USER_LIST=Alle Benutzer auflisten +TABLE_SUMMARY_LOGIN_USER_LIST=Diese Tabelle listet alle registrierten Benutzer aus, mit denen Sie Ihre Adressb\u00fccher teilen k\u00f6nnen. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 4ea8d2f4..d9124c03 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -157,7 +157,7 @@ GUEST_YES_READ_TERMS_CONDITIONS_2=and I accept them with this. TERMS_CONDITIONS=Terms & Conditions PAGE_TITLE_LOGIN_AREA=User area TABLE_HEADER_LIST_OWN_ADDRESSBOOKS=My own address books: -TABLE_SUMMARY_LIST_OWN_ADDRESSBOOKS=This table lists all of your created address books sorted by id nummer. +TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS=This table lists all of your created address books sorted by id nummer. LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK=Add additional address book LINK_LOGIN_ADD_FIRST_ADDRESSBOOK=Create first address book LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE=You can create an additional address book here. This way you can organize your contacts. @@ -196,5 +196,7 @@ PAGE_TITLE_LOGIN_SHARED_ADDRESSBOOKS=With others shared address books CONTENT_TITLE_LOGIN_SHARED_ADDRESSBOOKS=Mine with other users shared address books: LINK_LOGIN_START_SHARING_ADDRESSBOOKS=Start now sharing your address books with other users! LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS=My with other users shared address books -TABLE_SUMMARY_SHARED_ADDRESSBOOKS=This table lists all your with other users shared address books. +TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS=This table lists all your with other users shared address books. LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS=Currently you don't share any address books with other users. +LOGIN_TABLE_HEADER_USER_LIST=List all users +TABLE_SUMMARY_LOGIN_USER_LIST=This table lists all registered users you can share your address books with. diff --git a/web/login/login_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml index 9f7c6b4a..b69f47db 100644 --- a/web/login/login_own_addressbooks.xhtml +++ b/web/login/login_own_addressbooks.xhtml @@ -20,7 +20,7 @@

- + #{msg.ADDRESSBOOK_ID} diff --git a/web/login/login_shared_addressbooks.xhtml b/web/login/login_shared_addressbooks.xhtml index 8796fef3..6dbc57d1 100644 --- a/web/login/login_shared_addressbooks.xhtml +++ b/web/login/login_shared_addressbooks.xhtml @@ -19,7 +19,7 @@ #{msg.LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS}
- + diff --git a/web/login/login_user_list.xhtml b/web/login/login_user_list.xhtml index 2126006a..28b68bef 100644 --- a/web/login/login_user_list.xhtml +++ b/web/login/login_user_list.xhtml @@ -14,7 +14,14 @@ - Here goes your content. +
+
+ #{msg.LOGIN_TABLE_HEADER_USER_LIST} +
+ + + +
-- 2.39.5