Преглед изворни кода

Allow now as second parameter of bulk delete

pull/53/head
Kristijan Mitrovic пре 4 година
родитељ
комит
8c1f182169
2 измењених фајлова са 9 додато и 4 уклоњено
  1. +8
    -3
      bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
  2. +1
    -1
      utils/cobbzilla-wizard

+ 8
- 3
bubble-server/src/main/java/bubble/dao/account/AccountDAO.java Прегледај датотеку

@@ -348,10 +348,15 @@ public class AccountDAO extends AbstractCRUDDAO<Account> implements SqlViewSearc
log.info("copyTemplates completed: "+acct);
}

private final String NETWORK_OWNER_ACCOUNT_UUID_PARAM = "__thisNetworkOwnerAccountUuid__";

@Override public int bulkDeleteWhere(@NonNull final String whereClause,
@NonNull final Map<String, Object> parameters) {
parameters.put("thisNetworkOwnerAccountUuid", configuration.getThisNetwork().getAccount());
return super.bulkDeleteWhere("uuid != :thisNetworkOwnerAccountUuid AND (" + whereClause + ")", parameters);
@Nullable final Map<String, Object> parameters) {
final Map<String, Object> enhancedParams = parameters != null ? parameters : new HashMap<>();
enhancedParams.put(NETWORK_OWNER_ACCOUNT_UUID_PARAM, configuration.getThisNetwork().getAccount());

return super.bulkDeleteWhere("uuid != :" + NETWORK_OWNER_ACCOUNT_UUID_PARAM + " AND (" + whereClause + ")",
enhancedParams);
}

@Override public void delete(@Nullable final Collection<Account> accounts) {


+ 1
- 1
utils/cobbzilla-wizard

@@ -1 +1 @@
Subproject commit 6ad35ab2c21b8887f945b65cb224f99d870ab3ed
Subproject commit 14518c3c60a455df3542e68949d87dffc9e70ae7

Loading…
Откажи
Сачувај