koha: respect change branch param

koha/Deichman/Auth.pm

@@ -161,15 +161,14 @@ sub templateAndPermissions {
 
     # Use new auth object
     my $auth   = $self->{session}->get("auth");
-    my $branch = $auth->{user}->{branchcode} || $self->{session}->param("branchname");
-    my $userid = $auth->{user}->{userid}     || $self->{session}->param("userid");
+    my $branch = $self->{session}->param("branchname") || $auth->{user}->{branchcode}; # session param overrides stored branch
+    my $userid = $self->{session}->param("userid")     || $auth->{user}->{userid};     # session param overrides stored userid
     my $flags = $in->{flagsrequired};
 
     use Data::Dumper; warn Dumper($auth);
     my $info = {};
 
-    # admins have 'id' set, not 'userid'
-    # no login - present login page
+    # no session - present login page (admins have 'id' set, not 'userid' - TODO fix)
     if (not $userid and not $self->{session}->param("id") and !$in->{authnotrequired}) {
         my $auth_template = "auth.tt";
         my $template = C4::Templates::gettemplate( $auth_template, $in->{type}, $self);