Fixed: cyclic account hierarchies created by accounts setting parent …

…to self
oeiter · Feb 11, 2015 · 8fd7813 · 8fd7813
1 parent 0fdb76c
commit 8fd7813
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/org/gnucash/android/ui/account/AccountFormFragment.java b/app/src/main/java/org/gnucash/android/ui/account/AccountFormFragment.java
@@ -559,9 +559,9 @@ private void loadParentAccountList(AccountType accountType){
 
         if (mAccount != null){  //if editing an account
             mDescendantAccountUIDs = mAccountsDbAdapter.getDescendantAccountUIDs(mAccount.getUID(), null, null);
+            mDescendantAccountUIDs.add(mAccountsDbAdapter.getGnuCashRootAccountUID());
             // limit cyclic account hierarchies.
-            condition += " AND (" + DatabaseSchema.AccountEntry.COLUMN_PARENT_ACCOUNT_UID + " IS NULL "
-                    + " OR " + DatabaseSchema.AccountEntry.COLUMN_UID + " NOT IN ( '"
+            condition += " AND (" + DatabaseSchema.AccountEntry.COLUMN_UID + " NOT IN ( '"
                     + TextUtils.join("','", mDescendantAccountUIDs) + "','" + mAccountUID + "' ) )";
         }