Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SWITCHwayf
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Guillaume Rousse
SWITCHwayf
Commits
2faa56be
Commit
2faa56be
authored
Dec 18, 2017
by
Lukas Haemmerle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed #3886
parent
0120565d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
CHANGES.md
CHANGES.md
+1
-0
js/embeddedWAYF.js
js/embeddedWAYF.js
+16
-5
No files found.
CHANGES.md
View file @
2faa56be
...
...
@@ -36,6 +36,7 @@ SWITCHwayf Version History
web server environment variable to allow multi-tenant
deployments. Code provided by Guillaume Rousse.
-
Updated JQuery to v3.2.1
-
Hide IdPs also from category Last Used IdP
-
Made Javascript less prone to conflicts thanks to
contributed code from Christian Glahn
-
User HTTP post has preference over session cookies
...
...
js/embeddedWAYF.js
View file @
2faa56be
...
...
@@ -181,15 +181,15 @@ function isAllowedIdP(IdP){
type
=
wayf_other_fed_idps
[
IdP
].
type
;
}
// Check if IdP sh
all
be hidden
// Check if IdP sh
ould
be hidden
for
(
var
i
=
0
;
i
<
wayf_hide_idps
.
length
;
i
++
){
if
(
wayf_hide_idps
[
i
]
==
IdP
){
return
false
;
}
}
// Check if category
is
hidden
// Check if IdP is unhidden in this category
// Check if category
should be
hidden
// Check if IdP is unhidden in this category
for
(
var
i
=
0
;
i
<
wayf_hide_categories
.
length
;
i
++
){
if
(
wayf_hide_categories
[
i
]
===
"
all
"
||
wayf_hide_categories
[
i
]
==
type
){
...
...
@@ -1142,6 +1142,13 @@ function runImproveDropDown() {
}
var
currentIdP
=
decodeBase64
(
last_idps
[
i
]);
// Skip if IdP is hidden explicitly
if
(
!
isAllowedIdP
(
currentIdP
)){
continue
;
}
// Add option
var
content
=
getOptionHTML
(
currentIdP
);
if
(
content
!=
''
){
...
...
@@ -1167,8 +1174,12 @@ function runImproveDropDown() {
// Show most used IdPs in the order they are defined
var
IdPElements
=
''
;
for
(
var
i
=
0
;
i
<
wayf_most_used_idps
.
length
;
i
++
){
if
(
wayf_idps
[
wayf_most_used_idps
[
i
]]){
IdPElements
+=
getOptionHTML
(
wayf_most_used_idps
[
i
]);
var
currentIdP
=
wayf_most_used_idps
[
i
];
// Add option if IdP exists in list of elements
if
(
wayf_idps
[
currentIdP
]){
IdPElements
+=
getOptionHTML
(
currentIdP
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment