Skip to content

Commit 22c97f4

Browse files
committed
Switch from ldap.BtrMembers to foxdenUser.GetMembers API to support group look-up for different implementations of foxden user
1 parent 3dccd1c commit 22c97f4

2 files changed

Lines changed: 15 additions & 13 deletions

File tree

‎handlers.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2371,16 +2371,18 @@ func PublishFormHandler(c *gin.Context) {
23712371
tmpl["MCProjectName"] = project
23722372
tmpl["Parents"] = getAllParents(did)
23732373
// get all users associated with BTR
2374-
btr := utils.GetBtr(did)
2375-
tmpl["Btr"] = btr
2376-
if btrMembers, err := ldap.BtrMembers(
2377-
srvConfig.Config.LDAP.Login,
2378-
srvConfig.Config.LDAP.Password,
2379-
btr,
2380-
); err == nil {
2381-
tmpl["BtrMembers"] = btrMembers
2374+
group := _foxdenUser.GetGroup(did)
2375+
tmpl["Group"] = group
2376+
groupKey := "group"
2377+
if srvConfig.Config.CHESSMetaData.FoxdenUser.User == "CHESS" {
2378+
groupKey = "BTR"
2379+
}
2380+
tmpl["GroupKey"] = groupKey
2381+
members, err := _foxdenUser.GetMembers(group)
2382+
if err == nil {
2383+
tmpl["Members"] = members
23822384
} else {
2383-
log.Printf("### ERROR unable to get btr members for btr %s, error=%v", btr, err)
2385+
log.Printf("### ERROR unable to get btr members for group %s, error=%v", group, err)
23842386
}
23852387
page := server.TmplPage(StaticFs, "form_publish.tmpl", tmpl)
23862388
w.Write([]byte(header() + page + footer()))

‎static/templates/form_publish.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@
4949
<p><em>No parents found for this dataset.</em></p>
5050
{{end}}
5151
</div>
52-
{{if .BtrMembers}}
52+
{{if .Members}}
5353
<div class="form-item alert alert-info">
54-
<h4>BTR: {{.Btr}}</h4>
55-
You may select appropriate members of this BTR for your publication
54+
<h4>{{.GroupKey}}: {{.Group}}</h4>
55+
You may select appropriate members of this {{.GroupKey}} for your publication
5656
<label>
5757
<input type="checkbox" id="select-all" onclick="toggleAll(this)">
5858
<strong>Select All</strong>
5959
</label>
6060
<ul class="parent-list">
61-
{{range .BtrMembers}}
61+
{{range .Members}}
6262
<li>
6363
<label>
6464
<input type="checkbox" class="parent-checkbox" name="authors" value="{{.}}">

0 commit comments

Comments
 (0)