Added a number of checks for adding invalid links between different r…

…ecords (fix #612)
Serg-Norseman · Jan 28, 2025 · 7fbb3e3 · 7fbb3e3
1 parent 59632fc
commit 7fbb3e3
Show file tree

Hide file tree

Showing 31 changed files with 90 additions and 5 deletions.
diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -1026,3 +1026,4 @@
 1013=包含掩码
 1014=不包含掩码
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Czech.lng b/locales/Czech.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/English.lng b/locales/English.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/French.lng b/locales/French.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/German.lng b/locales/German.lng
@@ -1026,3 +1026,4 @@
 1013=enthält Maske
 1014=enthält keine Maske
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -1026,3 +1026,4 @@
 1013=maszkot tartalmaz
 1014=nem tartalmaz maszkot
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Italian.lng b/locales/Italian.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -1026,3 +1026,4 @@
 1013=マスクを含む
 1014=マスクを含まない
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Polish.lng b/locales/Polish.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Russian.lng b/locales/Russian.lng
@@ -1026,3 +1026,4 @@
 1013=содержит маску
 1014=не содержит маску
 1015=Переместить файлы
+1016=Недопустимая ссылка: идентичные записи!
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -1026,3 +1026,4 @@
 1013=contiene máscara
 1014=no contiene máscara
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Turkish.lng b/locales/Turkish.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/Ukrainian.lng b/locales/Ukrainian.lng
@@ -1026,3 +1026,4 @@
 1013=contains mask
 1014=not contains mask
 1015=Move files
+1016=Invalid link: identical records!
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p><b>??.??.2025 [v2.32.1 &amp; v3.8.1]</b></p>
     <ul>
+        <li>Added a number of checks for adding invalid links between different records.</li>
         <li>Added functions for moving multimedia files between absolute and relative paths, archive and storage.</li>
         <li>Minor improvements.</li>
     </ul>

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p><b>??.??.2025 [v2.32.1 &amp; v3.8.1]</b></p>
     <ul>
+        <li>Добавлен ряд проверок на добавление недопустимых ссылок между различными записями.</li>
         <li>Добавлены функции перемещения мультимедиа-файлов между абсолютными и относительными путями, архивом и хранилищем.</li>
         <li>Мелкие улучшения.</li>
     </ul>

diff --git a/projects/GKCore/GDModel/GDMFamilyRecord.cs b/projects/GKCore/GDModel/GDMFamilyRecord.cs
@@ -275,6 +275,11 @@ public void RemoveSpouse(GDMIndividualRecord spouse)
             }
         }
 
+        public bool HasMember(GDMIndividualRecord member)
+        {
+            return HasSpouse(member) || HasChild(member);
+        }
+
         public bool HasSpouse(GDMIndividualRecord spouse)
         {
             return (spouse != null) && (fHusband.XRef == spouse.XRef || fWife.XRef == spouse.XRef);

diff --git a/projects/GKCore/GKCore/BaseContext.cs b/projects/GKCore/GKCore/BaseContext.cs
@@ -2041,6 +2041,11 @@ public async Task<GDMIndividualRecord> AddChildForParent(IView owner, GDMIndivid
                             }
                         }
 
+                        if (family.HasMember(child)) {
+                            AppHost.StdDialogs.ShowAlert(LangMan.LS(LSID.InvalidLink));
+                            return null;
+                        }
+
                         if (family.AddChild(child)) {
                             // this repetition necessary, because the call of CreatePersonDialog only works if person already has a father,
                             // what to call AddChild () is no; all this is necessary in order to in the namebook were correct patronymics.

diff --git a/projects/GKCore/GKCore/Controllers/BaseController.cs b/projects/GKCore/GKCore/Controllers/BaseController.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2025 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -621,6 +621,12 @@ public static async Task<ModificationResult<GDMLocationLink>> ModifyLocationLink
                     result.Result = await AppHost.Instance.ShowModalAsync(dlg, owner, false);
                 }
 
+                if (locRec.XRef == locLink.XRef) {
+                    AppHost.StdDialogs.ShowAlert(LangMan.LS(LSID.InvalidLink));
+                    result.Result = false;
+                    return result;
+                }
+
                 if (!exists) {
                     if (result.Result) {
                         result.Result = undoman.DoOrdinaryOperation(OperationType.otLocationLinkAdd, locRec, locLink);
@@ -1246,6 +1252,11 @@ public static async Task<bool> AddFamilyHusband(IView owner, IBaseWindow baseWin
             var wife = baseWin.Context.Tree.GetPtrValue(family.Wife);
             GDMIndividualRecord husband = await baseWin.Context.SelectPerson(owner, wife, TargetMode.tmSpouse, GDMSex.svMale);
             if (husband != null && family.Husband.IsEmpty()) {
+                if (family.HasChild(husband)) {
+                    AppHost.StdDialogs.ShowWarning(LangMan.LS(LSID.FatherAsChild));
+                    return result;
+                }
+
                 result = localUndoman.DoOrdinaryOperation(OperationType.otFamilySpouseAttach, family, husband);
             }
 
@@ -1273,6 +1284,11 @@ public static async Task<bool> AddFamilyWife(IView owner, IBaseWindow baseWin, C
             var husband = baseWin.Context.Tree.GetPtrValue(family.Husband);
             GDMIndividualRecord wife = await baseWin.Context.SelectPerson(owner, husband, TargetMode.tmSpouse, GDMSex.svFemale);
             if (wife != null && family.Wife.IsEmpty()) {
+                if (family.HasChild(wife)) {
+                    AppHost.StdDialogs.ShowWarning(LangMan.LS(LSID.MotherAsChild));
+                    return result;
+                }
+
                 result = localUndoman.DoOrdinaryOperation(OperationType.otFamilySpouseAttach, family, wife);
             }
 

diff --git a/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs b/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs
@@ -435,7 +435,12 @@ public async void AddParents()
             AcceptTempData();
 
             GDMFamilyRecord family = await fBase.Context.SelectFamily(fView, fIndividualRecord);
-            if (family != null && family.IndexOfChild(fIndividualRecord) < 0) {
+            if (family != null) {
+                if (family.HasMember(fIndividualRecord)) {
+                    AppHost.StdDialogs.ShowAlert(LangMan.LS(LSID.InvalidLink));
+                    return;
+                }
+
                 fLocalUndoman.DoOrdinaryOperation(OperationType.otIndividualParentsAttach, fIndividualRecord, family);
             }
             UpdateControls();

diff --git a/projects/GKCore/GKCore/Controllers/TreeChartWinController.cs b/projects/GKCore/GKCore/Controllers/TreeChartWinController.cs
@@ -154,6 +154,11 @@ private async void ParentAdd(GDMSex needSex)
                         fam.AddChild(p.Rec);
                     }
 
+                    if (fam.HasMember(parent)) {
+                        AppHost.StdDialogs.ShowAlert(LangMan.LS(LSID.InvalidLink));
+                        return;
+                    }
+
                     fam.AddSpouse(parent);
 
                     UpdateChart();

diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
@@ -1090,8 +1090,9 @@ public enum LSID
         /* 1013 */ CondContainsMask,
         /* 1014 */ CondNotContainsMask,
         /* 1015 */ MoveFiles,
+        /* 1016 */ InvalidLink,
 
-        /* 000 */ Last = MoveFiles
+        /* 000 */ Last = InvalidLink
     }
 
 
@@ -2135,6 +2136,7 @@ public static class LangMan
             /* 1013 */ "contains mask",
             /* 1014 */ "not contains mask",
             /* 1015 */ "Move files",
+            /* 1016 */ "Invalid link: identical records!",
         };
 
         private static readonly LangManager fLangMan = new LangManager();

diff --git a/projects/GKCore/GKCore/Lists/ChildrenListModel.cs b/projects/GKCore/GKCore/Lists/ChildrenListModel.cs
@@ -113,8 +113,13 @@ public override async Task Modify(object sender, ModifyEventArgs eArgs)
             switch (eArgs.Action) {
                 case RecordAction.raAdd:
                     child = await fBaseWin.Context.SelectPerson(fOwner, tree.GetPtrValue(family.Husband), TargetMode.tmParent, GDMSex.svUnknown);
-                    result = (child != null && fBaseWin.Context.IsAvailableRecord(child) && !family.HasChild(child));
+                    result = (child != null && fBaseWin.Context.IsAvailableRecord(child));
                     if (result) {
+                        if (family.HasMember(child)) {
+                            AppHost.StdDialogs.ShowAlert(LangMan.LS(LSID.InvalidLink));
+                            return;
+                        }
+
                         result = fUndoman.DoOrdinaryOperation(OperationType.otIndividualParentsAttach, child, family);
                     }
                     break;
@@ -191,6 +196,11 @@ public override async Task Modify(object sender, ModifyEventArgs eArgs)
                         child = await fBaseWin.Context.SelectPerson(fOwner, target, TargetMode.tmParent, GDMSex.svUnknown);
                         result = (child != null && fBaseWin.Context.IsAvailableRecord(child));
                         if (result) {
+                            if (family.HasMember(child)) {
+                                AppHost.StdDialogs.ShowAlert(LangMan.LS(LSID.InvalidLink));
+                                return;
+                            }
+
                             result = fUndoman.DoOrdinaryOperation(OperationType.otIndividualParentsAttach, child, family);
                         }
                     }

diff --git a/projects/GKCore/GKCore/Lists/GroupListModel.cs b/projects/GKCore/GKCore/Lists/GroupListModel.cs
@@ -149,6 +149,11 @@ public override async Task Modify(object sender, ModifyEventArgs eArgs)
                 case RecordAction.raAdd:
                     member = await fBaseWin.Context.SelectPerson(fOwner, null, TargetMode.tmNone, GDMSex.svUnknown);
                     if (member != null) {
+                        if (grp.IndexOfMember(member) >= 0) {
+                            AppHost.StdDialogs.ShowAlert(LangMan.LS(LSID.InvalidLink));
+                            return;
+                        }
+
                         result = fUndoman.DoOrdinaryOperation(OperationType.otGroupMemberAttach, grp, member);
                     }
                     break;

diff --git a/projects/GKCore/GKCore/Lists/IndividualListModel.cs b/projects/GKCore/GKCore/Lists/IndividualListModel.cs
@@ -782,6 +782,11 @@ public override async Task Modify(object sender, ModifyEventArgs eArgs)
                 case RecordAction.raAdd:
                     groupRec = await fBaseWin.Context.SelectRecord(fOwner, GDMRecordType.rtGroup, null) as GDMGroupRecord;
                     if (groupRec != null) {
+                        if (groupRec.IndexOfMember(iRec) >= 0) {
+                            AppHost.StdDialogs.ShowAlert(LangMan.LS(LSID.InvalidLink));
+                            return;
+                        }
+
                         result = fUndoman.DoOrdinaryOperation(OperationType.otGroupMemberAttach, groupRec, iRec);
                     }
                     break;
@@ -985,7 +990,12 @@ public override async Task Modify(object sender, ModifyEventArgs eArgs)
             switch (eArgs.Action) {
                 case RecordAction.raAdd:
                     GDMFamilyRecord family = await fBaseWin.Context.SelectFamily(fOwner, iRec);
-                    if (family != null && family.IndexOfChild(iRec) < 0) {
+                    if (family != null) {
+                        if (family.HasMember(iRec)) {
+                            AppHost.StdDialogs.ShowAlert(LangMan.LS(LSID.InvalidLink));
+                            return;
+                        }
+
                         result = fUndoman.DoOrdinaryOperation(OperationType.otIndividualParentsAttach, iRec, family);
                     }
                     break;