Skip to content

Commit

Permalink
added support for external users. issue #2176
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-dimension
j-dimension committed Nov 13, 2023
1 parent a8ba59d commit 580e0c8
Show file tree
Hide file tree
Showing 22 changed files with 408 additions and 80 deletions.
2 changes: 1 addition & 1 deletion docker/getversion.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jlversion=`echo "$jlversion" | tr _ .`

# tadaaa!
# echo $jlversion
echo 2.6.0.3
echo 2.6.0.5

3 changes: 3 additions & 0 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/SplashThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,7 @@ public void run() {
AppUserBean[] assistUsers = null;
AppUserBean[] allUsers = null;
List<AppUserBean> loginEnabledUsers=null;
List<AppUserBean> messagingEnabledUsers=null;
try {
SystemManagementRemote mgmt = locator.lookupSystemManagementRemote();
ArchiveFileServiceRemote afs = locator.lookupArchiveFileServiceRemote();
Expand Down Expand Up @@ -827,6 +828,7 @@ public void run() {
updateStatus(java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/SplashThread").getString("status.option.6"), true);

loginEnabledUsers = security.getUsersHavingRole(UserSettings.ROLE_LOGIN);
messagingEnabledUsers = security.getMessagingEnabledUsers();

List<AppUserBean> users = mgmt.getUsers();
List<AppUserBean> lawyers = new ArrayList<>();
Expand Down Expand Up @@ -879,6 +881,7 @@ public void run() {
UserSettings.getInstance().setAssistantUsers(assistUsers);
UserSettings.getInstance().setAllUsers(allUsers);
UserSettings.getInstance().setLoginEnabledUsers(loginEnabledUsers);
UserSettings.getInstance().setMessagingEnabledUsers(messagingEnabledUsers);
settings.setTitles(titles);
settings.setTitlesInAddress(titlesInAddress);
settings.setCountries(countries);
Expand Down
54 changes: 35 additions & 19 deletions ...wyer-client/src/com/jdimension/jlawyer/client/configuration/UserAdministrationDialog.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,13 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jTabbedPane1" alignment="0" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Component id="cmdSave" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdClose" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Component id="cmdAdd" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0">
Expand All @@ -72,13 +78,13 @@
</Group>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jScrollPane1" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Component id="cmdSave" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdClose" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="chkShowExternalUsers" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="jScrollPane1" max="32767" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
Expand All @@ -101,8 +107,10 @@
<Component id="jScrollPane1" min="-2" pref="137" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jTabbedPane1" min="-2" pref="570" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="chkShowExternalUsers" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jTabbedPane1" min="-2" pref="532" max="-2" attributes="0"/>
<EmptySpace pref="27" max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="cmdClose" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cmdSave" alignment="3" min="-2" max="-2" attributes="0"/>
Expand Down Expand Up @@ -256,7 +264,7 @@
<Component id="jPanel3" min="-2" max="-2" attributes="0"/>
<Component id="jPanel13" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="281" max="32767" attributes="0"/>
<EmptySpace pref="164" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand Down Expand Up @@ -613,9 +621,9 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="jLabel21" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="430" max="32767" attributes="0"/>
<EmptySpace min="0" pref="382" max="32767" attributes="0"/>
</Group>
<Component id="jScrollPane5" max="32767" attributes="0"/>
<Component id="jScrollPane5" pref="402" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
Expand Down Expand Up @@ -715,7 +723,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jScrollPane6" pref="517" max="32767" attributes="0"/>
<Component id="jScrollPane6" pref="476" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="jLabel22" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
Expand Down Expand Up @@ -931,7 +939,7 @@
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="339" max="32767" attributes="0"/>
<EmptySpace pref="248" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand Down Expand Up @@ -1068,7 +1076,7 @@
<Component id="jSeparator2" min="-2" pref="10" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel26" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="248" max="32767" attributes="0"/>
<EmptySpace pref="154" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand Down Expand Up @@ -1258,9 +1266,9 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="jLabel19" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="435" max="32767" attributes="0"/>
<EmptySpace min="0" pref="382" max="32767" attributes="0"/>
</Group>
<Component id="jScrollPane4" max="32767" attributes="0"/>
<Component id="jScrollPane4" pref="402" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
Expand Down Expand Up @@ -1357,7 +1365,7 @@
<Component id="jLabel7" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="jScrollPane3" pref="519" max="32767" attributes="0"/>
<Component id="jScrollPane3" pref="476" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
Expand Down Expand Up @@ -1396,5 +1404,13 @@
</Container>
</SubComponents>
</Container>
<Component class="javax.swing.JCheckBox" name="chkShowExternalUsers">
<Properties>
<Property name="text" type="java.lang.String" value="Nutzer aus externen System anzeigen"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkShowExternalUsersActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Form>
Loading

0 comments on commit 580e0c8

Please sign in to comment.