Skip to content

Commit

Permalink
Merge branch 'feature/shibui-2003' of bitbucket.org:unicon/shib-idp-u…
Browse files Browse the repository at this point in the history
…i into feature/shibui-2003
  • Loading branch information
chasegawa committed Aug 9, 2021
2 parents 26a9cbc + 7d05a78 commit bb06c4a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ui/src/app/dashboard/view/SourcesTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function SourcesTab () {
async function changeSourceGroup(source, group) {
await updater.put(`/${source.id}`, {
...source,
groupId: group
idOfOwner: group
});
if (updater.response.ok) {
loadSources();
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/metadata/component/MetadataHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function MetadataHeader ({ showGroup, model, current = true, enabled = tr
let toast;
const resp = await put(`/${s.id}`, {
...s,
groupId: group
idOfOwner: group
});
if (response.ok) {
toast = createNotificationAction(`Updated group successfully.`, NotificationTypes.SUCCESS);
Expand Down Expand Up @@ -64,7 +64,7 @@ export function MetadataHeader ({ showGroup, model, current = true, enabled = tr
name={`group-${model.id}`}
className="form-control form-control-sm"
onChange={(event) => changeSourceGroup(model, event.target.value)}
value={model.groupId}
value={model.idOfOwner}
disabled={loadingGroups}
disablevalidation="true">
<option>Select Group</option>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/metadata/domain/source/component/SourceList.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
name={`group-${source.id}`}
className="form-control"
onChange={(event) => onChangeGroup(source, event.target.value)}
value={source.groupId ? source.groupId : ''}
value={source.idOfOwner ? source.idOfOwner : ''}
disabled={loadingGroups}
disablevalidation="true">
<option>Select Group</option>
Expand Down

0 comments on commit bb06c4a

Please sign in to comment.