llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 20:50:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix HasPromptPage() for signup items

Browse Source
This commit is contained in:
Gucheng Wang
2022-08-21 19:46:59 +08:00
parent ef5abdfa8f
commit 2d3d1167bb
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
object/application_item.go
View File

@ -73,6 +73,10 @@ func (application *Application) IsSignupItemRequired(itemName string) bool {
return signupItem.Required return signupItem.Required
} }
func (si *SignupItem) isSignupItemPrompted() bool {
return si.Visible && si.Prompted
}
func (application *Application) GetSignupItemRule(itemName string) string { func (application *Application) GetSignupItemRule(itemName string) string {
signupItem := application.getSignupItem(itemName) signupItem := application.getSignupItem(itemName)
if signupItem == nil { if signupItem == nil {
@ -92,6 +96,16 @@ func (application *Application) getAllPromptedProviderItems() []*ProviderItem {
return res return res
} }
func (application *Application) getAllPromptedSignupItems() []*SignupItem {
res := []*SignupItem{}
for _, signupItem := range application.SignupItems {
if signupItem.isSignupItemPrompted() {
res = append(res, signupItem)
}
}
return res
}
func (application *Application) isAffiliationPrompted() bool { func (application *Application) isAffiliationPrompted() bool {
signupItem := application.getSignupItem("Affiliation") signupItem := application.getSignupItem("Affiliation")
if signupItem == nil { if signupItem == nil {
@ -107,5 +121,10 @@ func (application *Application) HasPromptPage() bool {
return true return true
} }
signupItems := application.getAllPromptedSignupItems()
if len(signupItems) != 0 {
return true
}
return application.isAffiliationPrompted() return application.isAffiliationPrompted()
} }