Subversion Repositories DevTools

Rev

Rev 5030 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5030 Rev 5061
Line 222... Line 222...
222
' in-progress flag
222
' in-progress flag
223
'--------------------------------------------------------------------------------------------
223
'--------------------------------------------------------------------------------------------
224
Function UserAllowedToResetInProgress
224
Function UserAllowedToResetInProgress
225
   UserAllowedToResetInProgress = True
225
   UserAllowedToResetInProgress = True
226
   If objAccessControl.UserLogedIn Then
226
   If objAccessControl.UserLogedIn Then
227
      If NOT objAccessControl.IsActive("ResetDaemonInstInProgress") Then
227
      If NOT canActionControlInProject("ResetDaemonInstInProgress") Then
228
         UserAllowedToResetInProgress = False
228
         UserAllowedToResetInProgress = False
229
      End If
229
      End If
230
   Else
230
   Else
231
      UserAllowedToResetInProgress = False
231
      UserAllowedToResetInProgress = False
232
   End If
232
   End If
Line 402... Line 402...
402
Function UserCanAddOrEditThisDaemonInst(nProjId, nReleaseMode, nOpCode)
402
Function UserCanAddOrEditThisDaemonInst(nProjId, nReleaseMode, nOpCode)
403
 
403
 
404
   UserCanAddOrEditThisDaemonInst = TRUE
404
   UserCanAddOrEditThisDaemonInst = TRUE
405
 
405
 
406
   If objAccessControl.UserLogedIn Then
406
   If objAccessControl.UserLogedIn Then
407
      If NOT objAccessControl.IsDataActive ("PROJECTS", nProjId, "EditProjects") OR NOT objAccessControl.IsDataVisible ("PROJECTS", nProjId, "EditProjects")  Then
-
 
408
         UserCanAddOrEditThisDaemonInst = False
407
      If NOT canActionInProject() Then
409
      ElseIf NOT objAccessControl.IsDataActive ("PROJECTS", nProjId, enumDB_PERMISSION_TYPE_ACTIVE) Then
-
 
410
         UserCanAddOrEditThisDaemonInst = False
408
         UserCanAddOrEditThisDaemonInst = False
411
      ElseIf (( ReleaseMode <> enumDB_RELEASE_IN_OPEN_MODE ) AND (nOpCode = OP_CODE_0_RIPPLE_BUILD_PACKAGE) ) Then
409
      ElseIf (( ReleaseMode <> enumDB_RELEASE_IN_OPEN_MODE ) AND (nOpCode = OP_CODE_0_RIPPLE_BUILD_PACKAGE) ) Then
412
         If NOT objAccessControl.IsActive("ApproveForAutoBuild") Then
410
         If NOT canActionControlInProject("ApproveForAutoBuild") Then
413
            UserCanAddOrEditThisDaemonInst = False
411
            UserCanAddOrEditThisDaemonInst = False
414
         End If
412
         End If
415
      End If
413
      End If
416
   Else
414
   Else
417
      UserCanAddOrEditThisDaemonInst = False
415
      UserCanAddOrEditThisDaemonInst = False
418
   End If
416
   End If
-
 
417
 
419
End Function
418
End Function
420
 
419
 
421
'------------------------------------------------------------------------------------------------------------------------------------------
420
'------------------------------------------------------------------------------------------------------------------------------------------
422
 
421
 
423
 
422