Skip to content

Commit

Permalink
Merge pull request #1110 from ORCID/user-change-directive
Browse files Browse the repository at this point in the history 
Org ownership change logic
  • Loading branch information
@bobcaprice
bobcaprice authored Feb 8, 2024
2 parents 66a014b + b332699 commit 69b7aba
Show file tree
Hide file tree
Showing 13 changed files with 1,174 additions and 2,197 deletions.
4 changes: 1 addition & 3 deletions ui/src/app/user/user-update.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ <h1 id="jhi-ms-user-heading" class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser

<button
*ngIf="hasOwner"
jhi-ownershipChange
(then)="save()"
(else)="(false)"
(click)="confirmOwnershipChange()"
type="submit"
id="save-entity"
[disabled]="editForm.invalid || isSaving || memberList.length === 0"
Expand Down
8 changes: 8 additions & 0 deletions ui/src/app/user/user-update.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,14 @@ export class UserUpdateComponent {
}
}

confirmOwnershipChange() {
const question = $localize`:@@gatewayApp.msUserServiceMSUser.changeOwnership.question.string:Are you sure you want to transfer ownership? You are about to transfer ownership of this organization account. If you are the organization owner after transferring ownership, you will no longer have access to administrative functions, such as managing users.`
const result = confirm(question)
if (result) {
this.save()
}
}

save() {
if (this.editForm.valid) {
this.isSaving = true
Expand Down
327 changes: 111 additions & 216 deletions ui/src/i18n/messages.cs.xlf
View file

Large diffs are not rendered by default.

339 changes: 114 additions & 225 deletions ui/src/i18n/messages.es.xlf
View file

Large diffs are not rendered by default.

373 changes: 130 additions & 243 deletions ui/src/i18n/messages.fr.xlf
View file

Large diffs are not rendered by default.

338 changes: 115 additions & 223 deletions ui/src/i18n/messages.it.xlf
View file

Large diffs are not rendered by default.

321 changes: 111 additions & 210 deletions ui/src/i18n/messages.ja.xlf
View file

Large diffs are not rendered by default.

315 changes: 109 additions & 206 deletions ui/src/i18n/messages.ko.xlf
View file

Large diffs are not rendered by default.

339 changes: 115 additions & 224 deletions ui/src/i18n/messages.pt.xlf
View file

Large diffs are not rendered by default.

328 changes: 111 additions & 217 deletions ui/src/i18n/messages.ru.xlf
View file

Large diffs are not rendered by default.

53 changes: 30 additions & 23 deletions ui/src/i18n/messages.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -797,133 +797,133 @@
<source>Tools</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">52</context>
<context context-type="linenumber">47</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.tools.assertionServiceAffiliationManager.string" datatype="html">
<source>Affiliation Manager</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">66</context>
<context context-type="linenumber">61</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.report.member.string" datatype="html">
<source>Member report</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">79</context>
<context context-type="linenumber">74</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.report.integration.string" datatype="html">
<source>Integration report</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">92</context>
<context context-type="linenumber">87</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.report.consortium.string" datatype="html">
<source>Consortium report</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">105</context>
<context context-type="linenumber">100</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.report.affiliation.string" datatype="html">
<source>Affiliation report</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">116</context>
<context context-type="linenumber">111</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.report.consortiumMemberAffiliations.string" datatype="html">
<source>Consortium member affiliations</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">130</context>
<context context-type="linenumber">125</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.resources.main.string" datatype="html">
<source>Resources</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">146</context>
<context context-type="linenumber">141</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.resources.accountManagementGuide.string" datatype="html">
<source>Account Management Guide</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">157</context>
<context context-type="linenumber">152</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.resources.affiliationManagerGuide.string" datatype="html">
<source>Affiliation Manager Guide</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">167</context>
<context context-type="linenumber">162</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.resources.memberReportingGuide.string" datatype="html">
<source>Member Reporting Guide</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">177</context>
<context context-type="linenumber">172</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.resources.applyForAffiliationManagerCreds.string" datatype="html">
<source>Apply for Affiliation Manager Credentials</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">188</context>
<context context-type="linenumber">183</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.adminMenu.main.string" datatype="html">
<source>Admin</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">204</context>
<context context-type="linenumber">199</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.adminMenu.manageUsers.string" datatype="html">
<source>Manage users</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">217</context>
<context context-type="linenumber">212</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.adminMenu.manageMembers.string" datatype="html">
<source>Manage members</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">230</context>
<context context-type="linenumber">225</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.account.main.string" datatype="html">
<source>Account</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">245</context>
<context context-type="linenumber">240</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.account.settings.string" datatype="html">
<source>Settings</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">255</context>
<context context-type="linenumber">250</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.account.password.string" datatype="html">
<source>Password</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">261</context>
<context context-type="linenumber">256</context>
</context-group>
</trans-unit>
<trans-unit id="global.menu.account.logout.string" datatype="html">
<source>Sign out</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
<context context-type="linenumber">267</context>
<context context-type="linenumber">262</context>
</context-group>
</trans-unit>
<trans-unit id="error.subtitle" datatype="html">
Expand Down Expand Up @@ -1053,7 +1053,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/user/user-update.component.html</context>
<context context-type="linenumber">144</context>
<context context-type="linenumber">142</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/user/users.component.html</context>
Expand Down Expand Up @@ -1096,11 +1096,11 @@
<source>Save</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/user/user-update.component.html</context>
<context context-type="linenumber">125</context>
<context context-type="linenumber">123</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/user/user-update.component.html</context>
<context context-type="linenumber">135</context>
<context context-type="linenumber">133</context>
</context-group>
</trans-unit>
<trans-unit id="gatewayApp.msUserServiceMSUser.activated.string" datatype="html">
Expand Down Expand Up @@ -1319,7 +1319,7 @@
<source>Showing <x id="PH" equiv-text="first"/> - <x id="PH_1" equiv-text="second"/> of <x id="PH_2" equiv-text="this.totalItems"/> items.</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/user/users.component.ts</context>
<context context-type="linenumber">243</context>
<context context-type="linenumber">246</context>
</context-group>
</trans-unit>
<trans-unit id="global.true.string" datatype="html">
Expand All @@ -1337,6 +1337,13 @@
<context context-type="linenumber">42</context>
</context-group>
</trans-unit>
<trans-unit id="gatewayApp.msUserServiceMSUser.changeOwnership.question.string" datatype="html">
<source>Are you sure you want to transfer ownership? You are about to transfer ownership of this organization account. If you are the organization owner after transferring ownership, you will no longer have access to administrative functions, such as managing users.</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/user/user-update.component.ts</context>
<context context-type="linenumber">216</context>
</context-group>
</trans-unit>
</body>
</file>
</xliff>
Loading

0 comments on commit 69b7aba

Please sign in to comment.