The Unified and Autonomous Development Platform
Prompt user to delete repositories first before deleting an account
robin shine9c0aca2b9e56
diff --git a/server.core/src/main/java/com/gitplex/server/core/entity/Account.java b/server.core/src/main/java/com/gitplex/server/core/entity/Account.javaindex 903f63e973..6d7d257dae 100644--- a/server.core/src/main/java/com/gitplex/server/core/entity/Account.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/Account.java@@ -94,7 +94,7 @@ public class Account extends AbstractUser implements ProtectedObject {@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<UserAuthorization> authorizedDepots = new ArrayList<>();- @OneToMany(mappedBy="account", cascade=CascadeType.REMOVE)+ @OneToMany(mappedBy="account")private Collection<Depot> depots = new ArrayList<>();/* used by organization account */diff --git a/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.javaindex a21aee3ac8..24fa8e50c3 100644--- a/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.java@@ -13,8 +13,6 @@ import org.hibernate.Query;import org.hibernate.ReplicationMode;import org.hibernate.criterion.Restrictions;-import com.google.common.collect.BiMap;-import com.google.common.collect.HashBiMap;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;@@ -29,14 +27,13 @@ import com.gitplex.server.core.entity.support.IntegrationPolicy;import com.gitplex.server.core.event.lifecycle.SystemStarting;import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;import com.gitplex.server.core.manager.AccountManager;-import com.gitplex.server.core.manager.DepotManager;import com.gitplex.server.core.manager.PullRequestManager;+import com.google.common.collect.BiMap;+import com.google.common.collect.HashBiMap;@Singletonpublic class DefaultAccountManager extends AbstractEntityManager<Account> implements AccountManager {- private final DepotManager depotManager;-private final PullRequestManager pullRequestManager;private final ReadWriteLock idLock = new ReentrantReadWriteLock();@@ -46,10 +43,9 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implemprivate final BiMap<String, Long> nameToId = HashBiMap.create();@Inject- public DefaultAccountManager(Dao dao, DepotManager depotManager, PullRequestManager pullRequestManager) {+ public DefaultAccountManager(Dao dao, PullRequestManager pullRequestManager) {super(dao);- this.depotManager = depotManager;this.pullRequestManager = pullRequestManager;}@@ -126,9 +122,6 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implemquery.setParameter("user", account);query.executeUpdate();- for (Depot depot: account.getDepots())- depotManager.delete(depot);-dao.remove(account);for (Depot depot: dao.findAll(Depot.class)) {diff --git a/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.javaindex d1300acfe2..30c96595b0 100644--- a/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java@@ -28,7 +28,7 @@ public abstract class ConfirmDeleteAccountModal extends ConfirmDeleteModal {@Overrideprotected String getWarningMessage() {- return "All repositories, pull requests and comments belonging to this account will also be deleted, "+ return "All pull requests submitted by and comments belonging to account \"" + getAccount().getName() + "\" will also be deleted, "+ "please input account name below to confirm deletion.";}diff --git a/server.web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.javaindex 907325d7ce..2c871a6f20 100644--- a/server.web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java@@ -102,19 +102,23 @@ public class ProfileEditPage extends AccountSettingPage {@Overridepublic void onClick(AjaxRequestTarget target) {- new ConfirmDeleteAccountModal(target) {-- @Override- protected void onDeleted(AjaxRequestTarget target) {- setResponsePage(getApplication().getHomePage());- }-- @Override- protected Account getAccount() {- return ProfileEditPage.this.getAccount();- }-- };+ if (!getAccount().getDepots().isEmpty()) {+ target.appendJavaScript("alert('Please delete or transfer repositories under this account first');");+ } else {+ new ConfirmDeleteAccountModal(target) {++ @Override+ protected void onDeleted(AjaxRequestTarget target) {+ setResponsePage(getApplication().getHomePage());+ }++ @Override+ protected Account getAccount() {+ return ProfileEditPage.this.getAccount();+ }++ };+ }}});diff --git a/server.web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.javaindex ba67cde0f8..0b574138eb 100644--- a/server.web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java@@ -128,20 +128,25 @@ public class UserListPage extends AdministrationPage {@Overridepublic void onClick(AjaxRequestTarget target) {- new ConfirmDeleteAccountModal(target) {-- @Override- protected void onDeleted(AjaxRequestTarget target) {- target.add(accountsContainer);- target.add(pagingNavigator);- target.add(noAccountsContainer);- }-- @Override- protected Account getAccount() {- return GitPlex.getInstance(AccountManager.class).load(accountId);- }- };+ Account account = GitPlex.getInstance(AccountManager.class).load(accountId);+ if (!account.getDepots().isEmpty()) {+ target.appendJavaScript("alert('Please delete or transfer repositories under this account first');");+ } else {+ new ConfirmDeleteAccountModal(target) {++ @Override+ protected void onDeleted(AjaxRequestTarget target) {+ target.add(accountsContainer);+ target.add(pagingNavigator);+ target.add(noAccountsContainer);+ }++ @Override+ protected Account getAccount() {+ return GitPlex.getInstance(AccountManager.class).load(accountId);+ }+ };+ }}@Override