Changeset 1285 for trunk

Timestamp:

04/05/19 11:02:14 (5 years ago)

Author:

bln4

Message:

Upon login, if the user has requested an initial frame (by passing argument when starting Expeditee) then direct the logging in user to that frame.

File:

• trunk/src/org/expeditee/auth/Actions.java (modified) (1 diff)

trunk/src/org/expeditee/auth/Actions.java

@@ -575 +575 @@
                 Collection<Item> usernameFields = getByData(FrameIO.LoadFrame(Constants.FRAME_MULTIUSER1), "txtUsername");
                 usernameFields.forEach(usernameField -> usernameField.setText(username));
-                                
+                
+                Frame requestedFrame = FrameIO.LoadFrame(Browser.getStartFrame());
                 Frame homeFrame = FrameIO.LoadFrame("home1");
-                DisplayController.setCurrentFrame(homeFrame == null ? oneFrame : homeFrame, false);
+                Frame choice = requestedFrame != null ? requestedFrame : homeFrame != null ? homeFrame : oneFrame;
+                DisplayController.setCurrentFrame(choice, false);
         }