MS

2016-08-25 17:08:41 +02:00 · 2016-08-25 17:08:41 +02:00 · 23612edc88
commit 23612edc88
parent c02e5e235c
12 changed files with 2303 additions and 3120 deletions
--- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb
+++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb
@ -274,8 +274,12 @@ Public Class ClassDOC_SEARCH
                    If DD_Rights.ClassRights.Collect_Users(RECORD_ID, ENTITY_ID) = True Then
                        If DD_Rights.ClassRights.File_DeleteAndSetRight(RESULT_DOCID, RESULT_DOC_PATH, True) Then
                            If DD_Rights.ClassRights.MSG_RESULT <> "" Then
-                                MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation)
-                                Return False
+                                Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT
+                                If USER_LANGUAGE <> "de-DE" Then
+                                    msg = "Attention: some rights could not be set: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT
+                                End If
+                                MsgBox(msg, MsgBoxStyle.Exclamation)
+                                Return True
                            Else
                                Return True
                            End If
--- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
--- a/app/DD-Record-Organiser/frmConstructor_Main.resx
+++ b/app/DD-Record-Organiser/frmConstructor_Main.resx
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@ -2040,21 +2040,6 @@ Public Class frmConstructor_Main

            End If

-            'If RIGHT_CONTROL_CHANGED = True Then
-            '    Dim msg = MSG_RIGHTMODULE_DE
-            '    If USER_LANGUAGE <> "de-DE" Then
-            '        msg = MSG_RIGHTMODULE_EN_US
-            '    End If
-            '    Dim result As MsgBoxResult
-            '    result = MessageBox.Show(msg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-            '    If result = MsgBoxResult.No Then
-            '        RIGHT_CONTROL_CHANGED = False
-            '        RECORD_CHANGED = False
-            '        DisableEditMode()
-            '        Show_Selected_Record_Data(SELECTED_RECORD_ID, False)
-            '        Return True
-            '    End If
-            'End If


            If TrySave_User() = False Then
@ -5891,28 +5876,8 @@ Public Class frmConstructor_Main
                ' Änderungen sollen gespeichert werden
                If ShouldSave = DialogResult.Yes Then

-                    If RIGHT_CONTROL_CHANGED = True Then
-                        Dim msg = "Achtung: " & vbNewLine & "Sie haben Änderungen an Rechte-relevanten Eingaben vorgenommen!" & vbNewLine & _
-                            "Alle Rechte der zu diesem Datensatz gespeicherten Dateien werden nach Speichern serverseitig und im Hintergrund überprüft!" & vbNewLine & _
-                            "Dies kann je nach Anzahl der Dateien bis zu 15 Minuten dauern! Wollen Sie fortfahren?"
-                        If USER_LANGUAGE <> "de-DE" Then
-                            msg = "Attention:" & "You applied changes to right-relevant data!" & vbNewLine & _
-                                "All rights of files belonging to this record will be checked and changed after Saving!" & vbNewLine & _
-                            "This might take up to 15 Minutes (related to the amount of files)! Would You like to continue?"
-                        End If
-                        Dim result As MsgBoxResult
-                        result = MessageBox.Show(msg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                        If result = MsgBoxResult.No Then
-                            RIGHT_CONTROL_CHANGED = False
-                            RECORD_CHANGED = False
-                            Return True
-                        End If
-                    End If
-
-
                    If CtrlCommandUI.IsInsert Then
                        EDIT_STATE = EditState.None
-
                    End If

                    Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled()
--- a/app/DD-Record-Organiser/frmMain.Designer.vb
+++ b/app/DD-Record-Organiser/frmMain.Designer.vb
@ -65,6 +65,7 @@ Partial Class frmMain
        Me.BarButtonItem14 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem21 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem22 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
        Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.groupQuickAccessForm = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@ -80,7 +81,6 @@ Partial Class frmMain
        Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem()
        Me.TimerClose3Minutes = New System.Windows.Forms.Timer(Me.components)
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
        Me.cmsSystray.SuspendLayout()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@ -425,6 +425,13 @@ Partial Class frmMain
        Me.BarButtonItem22.Id = 41
        Me.BarButtonItem22.Name = "BarButtonItem22"
        '
+        'BarButtonItem8
+        '
+        resources.ApplyResources(Me.BarButtonItem8, "BarButtonItem8")
+        Me.BarButtonItem8.Glyph = CType(resources.GetObject("BarButtonItem8.Glyph"), System.Drawing.Image)
+        Me.BarButtonItem8.Id = 44
+        Me.BarButtonItem8.Name = "BarButtonItem8"
+        '
        'pageHome
        '
        Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm})
@ -538,13 +545,6 @@ Partial Class frmMain
        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
        '
-        'BarButtonItem8
-        '
-        resources.ApplyResources(Me.BarButtonItem8, "BarButtonItem8")
-        Me.BarButtonItem8.Glyph = CType(resources.GetObject("BarButtonItem8.Glyph"), System.Drawing.Image)
-        Me.BarButtonItem8.Id = 44
-        Me.BarButtonItem8.Name = "BarButtonItem8"
-        '
        'frmMain
        '
        Me.Appearance.BackColor = CType(resources.GetObject("frmMain.Appearance.BackColor"), System.Drawing.Color)
--- a/app/DD-Record-Organiser/frmMain.resx
+++ b/app/DD-Record-Organiser/frmMain.resx
@ -1954,35 +1954,35 @@ Konfiguration</value>
  </data>
  <data name="BarButtonItem8.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        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
+        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
+        3MYaqRIAAAAASUVORK5CYII=
 </value>
  </data>
  <data name="ribbonMain.Location" type="System.Drawing.Point, System.Drawing">
@ -2022,13 +2022,13 @@ Konfiguration</value>
    <value>Administration</value>
  </data>
  <data name="ribbonMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1618, 150</value>
+    <value>1626, 150</value>
  </data>
  <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 715</value>
+    <value>0, 719</value>
  </data>
  <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1618, 23</value>
+    <value>1626, 23</value>
  </data>
  <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
    <value>RibbonStatusBar1</value>
@ -2079,7 +2079,7 @@ Konfiguration</value>
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1618, 738</value>
+    <value>1626, 742</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
@ -3213,6 +3213,12 @@ Konfiguration</value>
  <data name="&gt;&gt;BarButtonItem22.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;BarButtonItem8.Name" xml:space="preserve">
+    <value>BarButtonItem8</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem8.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;pageHome.Name" xml:space="preserve">
    <value>pageHome</value>
  </data>
@ -3297,12 +3303,6 @@ Konfiguration</value>
  <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;BarButtonItem8.Name" xml:space="preserve">
-    <value>BarButtonItem8</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem8.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmMain</value>
  </data>
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@ -765,4 +765,5 @@ Public Class frmMain
        Close_Maximized_Forms()
        OpenRightsmanager()
    End Sub
+
 End Class
--- a/app/DD-Record-Organiser/frmWD_IndexFile.vb
+++ b/app/DD-Record-Organiser/frmWD_IndexFile.vb
@ -179,7 +179,11 @@ Public Class frmWD_IndexFile
                            sql = String.Format("SELECT DocID FROM  VWPMO_WD_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
                            CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql)
                            If Not IsNothing(CURRENT_DOC_ID) Then
-                                ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, CURRENT_FORM_ID)
+                                If ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, CURRENT_FORM_ID) = False Then
+                                    MsgBox("The rights for the new file could not be created! Please check the logfile!" & vbNewLine & _
+                                           "ADDI will try to give You at least reading rights!", MsgBoxStyle.Exclamation)
+                                    DD_Rights.ClassRights.SetRightExplicit(CURRENT_DOC_ID, CURRENT_FILEIN_WD, Environment.UserName, 1)
+                                End If
                                ClassFileResult.DocID = CURRENT_DOC_ID
                                ClassFileResult.SET_DOCID_INDICES()
                                If ClassDOC_SEARCH.SET_RECORD_DOCID_LINK(CURRENT_DOC_ID, CURRENT_RECORD_ID) = True Then
--- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
@ -8,6 +8,7 @@ Public Class frmCheckRightsEntity
    Private WorkingFiles As Integer = 0
    Private CURR_DOCID As Integer
    Private ENTITY_ID As Integer
+    Dim righterrors As Boolean = False
    Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
            Dim sql = String.Format("SELECT T.FORM_ID, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T.[FORM_VIEW_ID]), 1) AS FORM_TITLE FROM VWPMO_CONSTRUCTOR_FORMS T WHERE DOCUMENT_VIEW = 1", USER_LANGUAGE)
@ -24,6 +25,7 @@ Public Class frmCheckRightsEntity
    Private Sub btnCheckRights_Click(sender As Object, e As EventArgs) Handles btnCheckRights.Click
        If cmbentity.SelectedIndex <> -1 Then
            Try
+                righterrors = False
                CURR_DOCID = 0
                ENTITY_ID = cmbentity.SelectedValue
                Me.ProgressBar1.Visible = True
@ -74,8 +76,7 @@ Public Class frmCheckRightsEntity
                    CURR_DOCID = row.Item("DocID")
                    If DD_Rights.ClassRights.File_DeleteAndSetRight(row.Item("DocID"), row.Item("FULL_FILENAME"), True) Then
                        If DD_Rights.ClassRights.MSG_RESULT <> "" Then
-                            MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation)
-                            _error = True
+                            righterrors = True
                        End If
                    Else
                        _error = True
@ -113,7 +114,12 @@ Public Class frmCheckRightsEntity
            lblstate.Visible = False
            ProgressBar1.Visible = False
            If _error = False Then
-                MsgBox("All rights of files belonging to entity were checked and refreshed successfully!", MsgBoxStyle.Information)
+
+                If righterrors = True Then
+                    MsgBox("All rights of files belonging to entity were checked and refreshed, " & vbNewLine & "BUT some Userrights could not be set. Check the logfile!", MsgBoxStyle.Exclamation, "Attention")
+                Else
+                    MsgBox("All rights of files belonging to entity were checked and refreshed successfully!", MsgBoxStyle.Information)
+                End If
            Else
                MsgBox("Some errors occured while checking and setting the rights...please check the log!" & vbNewLine & ">> " & ClassRights.COUNT_FILES.ToString & " files schould be worked." & _
                       ">> " & ClassRights.WORKED_FILES.ToString & " were worked successfully.", MsgBoxStyle.Exclamation)
--- a/app/RecordOrganizer_RightManager/frmStart.Designer.vb
+++ b/app/RecordOrganizer_RightManager/frmStart.Designer.vb
@ -29,6 +29,7 @@ Partial Class frmStart
        Me.Button2 = New System.Windows.Forms.Button()
        Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
        Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        Me.chkLogerrorsonly = New System.Windows.Forms.CheckBox()
        Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
        Me.btnrefreshJobs = New System.Windows.Forms.Button()
@ -47,16 +48,15 @@ Partial Class frmStart
        Me.Label1 = New System.Windows.Forms.Label()
        Me.VWPMO_RIGHTS_2B_WORKEDTableAdapter = New RecordOrganizer_RightManager.MyDatasetTableAdapters.VWPMO_RIGHTS_2B_WORKEDTableAdapter()
        Me.TableAdapterManager = New RecordOrganizer_RightManager.MyDatasetTableAdapters.TableAdapterManager()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabControl1.SuspendLayout()
        Me.XtraTabPage1.SuspendLayout()
+        Me.GroupBox1.SuspendLayout()
        Me.XtraTabPage2.SuspendLayout()
        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_RIGHTS_2B_WORKEDBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.GroupBox1.SuspendLayout()
        Me.SuspendLayout()
        '
        'Button1
@ -96,7 +96,7 @@ Partial Class frmStart
        Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Button2.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.folder_Closed_16xSM
        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button2.Location = New System.Drawing.Point(703, 14)
+        Me.Button2.Location = New System.Drawing.Point(707, 14)
        Me.Button2.Name = "Button2"
        Me.Button2.Size = New System.Drawing.Size(111, 23)
        Me.Button2.TabIndex = 1
@ -122,9 +122,20 @@ Partial Class frmStart
        Me.XtraTabPage1.Controls.Add(Me.btnWorkUserRightsSV_ADD)
        Me.XtraTabPage1.Controls.Add(Me.btnWorkUserRights)
        Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(821, 304)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(825, 307)
        Me.XtraTabPage1.Text = "Jobs and Tools"
        '
+        'GroupBox1
+        '
+        Me.GroupBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.GroupBox1.Controls.Add(Me.chkLogerrorsonly)
+        Me.GroupBox1.Location = New System.Drawing.Point(618, 43)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.Size = New System.Drawing.Size(200, 67)
+        Me.GroupBox1.TabIndex = 6
+        Me.GroupBox1.TabStop = False
+        Me.GroupBox1.Text = "Dienstkonfiguration:"
+        '
        'chkLogerrorsonly
        '
        Me.chkLogerrorsonly.AutoSize = True
@ -290,17 +301,6 @@ Partial Class frmStart
        Me.TableAdapterManager.Connection = Nothing
        Me.TableAdapterManager.UpdateOrder = RecordOrganizer_RightManager.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.GroupBox1.Controls.Add(Me.chkLogerrorsonly)
-        Me.GroupBox1.Location = New System.Drawing.Point(614, 43)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(200, 67)
-        Me.GroupBox1.TabIndex = 6
-        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Dienstkonfiguration:"
-        '
        'frmStart
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -315,14 +315,14 @@ Partial Class frmStart
        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.XtraTabControl1.ResumeLayout(False)
        Me.XtraTabPage1.ResumeLayout(False)
+        Me.GroupBox1.ResumeLayout(False)
+        Me.GroupBox1.PerformLayout()
        Me.XtraTabPage2.ResumeLayout(False)
        Me.XtraTabPage2.PerformLayout()
        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.VWPMO_RIGHTS_2B_WORKEDBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox1.PerformLayout()
        Me.ResumeLayout(False)

    End Sub
--- a/app/RecordOrganizer_RightManager/frmStart.vb
+++ b/app/RecordOrganizer_RightManager/frmStart.vb
@ -8,7 +8,7 @@ Public Class frmStart
                MsgBox("Error in Initializing Database. Please check log.", MsgBoxStyle.Critical)
                Me.Close()
            End If
-            chkLogerrorsonly.Checked = CBool(clsDatabase.Execute_Scalar("SELECT LOG_ERR_ONLY_RIGHTS_MANAGER FROM TBPMO_KONFIGURATION WHERE GUID = 1"))
+            chkLogerrorsonly.Checked = CBool(clsDatabase.Execute_Scalar("SELECT LOG_ERR_ONLY FROM TBPMO_SERVICE_RIGHT_CONFIG WHERE GUID = 1"))
            Dim sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", Environment.UserName)
            clsLogger.Add(">> Login at: " & Now.ToString, False)
            clsLogger.Add(">> Username: " & Environment.UserName, False)
@ -143,7 +143,7 @@ Public Class frmStart
        If chkLogerrorsonly.Checked Then
            _set = 1
        End If
-        Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET LOG_ERR_ONLY_RIGHTS_MANAGER = {0} where GUID = 1", _set)
+        Dim upd = String.Format("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET LOG_ERR_ONLY = {0} where GUID = 1", _set)
        clsDatabase.Execute_non_Query(upd)
    End Sub

--- a/app/RecordOrganizer_RightManager/frmSupervisorEntity.vb
+++ b/app/RecordOrganizer_RightManager/frmSupervisorEntity.vb
@ -131,8 +131,8 @@ Public Class frmSupervisorEntity
                                MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation)
                                _error = True
                            Else
-                                If DD_Rights.ClassRights.Collect_MainUsers(row.Item("ENTITY_ID"), USER_ID, row.Item("RECORD_ID")) Then
-                                    If ClassRights.DT_USER_RIGHTS.Rows.Count > 0 Then
+                                If DD_Rights.ClassRights.Collect_MainUsers(row.Item("ENTITY_ID"), USER_ID, row.Item("RECORD_ID"), True) Then
+                                    If ClassRights.DT_USER_RIGHT.Rows.Count > 0 Then
                                        clsLogger.Add(">> User owns rights for File/Record - right will be set!", False)
                                        If ClassRights.File_DeleteAndSetRight(row.Item("DocID"), row.Item("FULL_FILENAME"), False) Then