Changeset 132 for trunk/Packages/CoolWeb/Modules/UWebUser.pas

Timestamp:

Mar 18, 2022, 3:47:27 PM (2 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/Packages/CoolWeb/Modules/UWebUser.pas (modified) (1 diff)

trunk/Packages/CoolWeb/Modules/UWebUser.pas

@@ -267 +267 @@
   Result := False;
   try
-      DbRows2 := TDbRows.Create;
-
-      // Check group-operation relation
-      Database.Select(DbRows2, 'PermissionGroupAssignment', 'Id',
-        '`User` = ' + IntToStr(Id) + ' AND `AssignedOperation` = ' + IntToStr(Operation));
-      if DbRows2.Count > 0 then begin
+    DbRows2 := TDbRows.Create;
+
+    // Check group-operation relation
+    Database.Select(DbRows2, 'PermissionGroupAssignment', 'Id',
+      '`User` = ' + IntToStr(Id) + ' AND `AssignedOperation` = ' + IntToStr(Operation));
+    if DbRows2.Count > 0 then begin
+      Result := True;
+      Exit;
+    end;
+
+    // Check group-group relation
+    Database.Select(DbRows2, 'PermissionGroupAssignment', 'AssignedGroup',
+      '`User` = ' + IntToStr(Id) + ' AND `AssignedGroup` IS NOT NULL');
+    if DbRows2.Count > 0 then begin
+      if CheckGroupPermission(StrToInt(DbRows2[0].Values['AssignedGroup']), Operation) then begin
         Result := True;
         Exit;
       end;
-
-      // Check group-group relation
-      Database.Select(DbRows2, 'PermissionGroupAssignment', 'AssignedGroup',
-        '`User` = ' + IntToStr(Id) + ' AND `AssignedGroup` IS NOT NULL');
-      if DbRows2.Count > 0 then begin
-        if CheckGroupPermission(StrToInt(DbRows2[0].Values['AssignedGroup']), Operation) then begin
-          Result := True;
-          Exit;
-        end;
-      end;
-    finally
-      DbRows2.Free;
-    end;
+    end;
+  finally
+    DbRows2.Free;
+  end;
 end;