Subversion Repositories DevTools

Rev

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

Rev 5177 Rev 5178
Line 128... Line 128...
128
objBtnControl.ButtonSpacer = 0
128
objBtnControl.ButtonSpacer = 0
129
objBtnControl.ImageHspace = 2
129
objBtnControl.ImageHspace = 2
130
 
130
 
131
 
131
 
132
'--- Set button conditions ---
132
'--- Set button conditions ---
133
objBtnControl.IsReadonlyAction = Eval( ReleaseMode = enumDB_RELEASE_IN_CLOSED_MODE OR ReleaseMode = enumDB_RELEASE_IN_PRESERVE_MODE OR ReleaseMode = enumDB_RELEASE_IN_ARCHIVE_MODE )
133
objBtnControl.IsReadonlyAction = releaseIsClosed(ReleaseMode)
134
objBtnControl.setClosed        = Eval( ReleaseMode = enumDB_RELEASE_IN_CLOSED_MODE OR ReleaseMode = enumDB_RELEASE_IN_PRESERVE_MODE OR ReleaseMode = enumDB_RELEASE_IN_ARCHIVE_MODE )
134
objBtnControl.setClosed        = releaseIsClosed(ReleaseMode)
135
 
135
 
136
 
136
 
137
' NOTE: At this point, all buttons are Active and Visible and must now be configured
137
' NOTE: At this point, all buttons are Active and Visible and must now be configured
138
'       as appropriate by statements that follow.
138
'       as appropriate by statements that follow.
139
 
139
 
Line 355... Line 355...
355
'--- Access Control Action Relationships ---
355
'--- Access Control Action Relationships ---
356
 
356
 
357
 
357
 
358
' DEVI-45275 - Merges now occur via the Pending tab. Merge candidates are marked with a (planned) operation
358
' DEVI-45275 - Merges now occur via the Pending tab. Merge candidates are marked with a (planned) operation
359
' of "A" for add, or "S" for subtract. If the package version is one of these (within the context of the
359
' of "A" for add, or "S" for subtract. If the package version is one of these (within the context of the
360
' release ofcoarse), manipulate the MakeRelease button (of which there are now 3 types) accordingly.
360
' release of coarse), manipulate the MakeRelease button (of which there are now 3 types) accordingly.
361
If ( pkgInfoHash.Item ("planned_operation") = "A" OR pkgInfoHash.Item ("planned_operation") = "S") Then
361
If ( pkgInfoHash.Item ("planned_operation") = "A" OR pkgInfoHash.Item ("planned_operation") = "S") Then
362
 
362
 
363
   ' always enable the reject button for pending merge operations
363
   ' always enable the reject button for pending merge operations
364
   Call objBtnControl.Visible ( "btnRejectPackage", "Y" )
364
   Call objBtnControl.Visible ( "btnRejectPackage", "Y" )
365
 
365
 
Line 370... Line 370...
370
   ' make the approve merge button variant visible
370
   ' make the approve merge button variant visible
371
   Call objBtnControl.Visible ( "btnApproveMerge", "Y" )
371
   Call objBtnControl.Visible ( "btnApproveMerge", "Y" )
372
 
372
 
373
   ' These conditions match those used in Diff.asp that control whether the Merge button is visible or not.
373
   ' These conditions match those used in Diff.asp that control whether the Merge button is visible or not.
374
   ' Use them to enable or disable the approve merge button
374
   ' Use them to enable or disable the approve merge button
375
   If ( ReleaseMode <> enumDB_RELEASE_IN_ARCHIVE_MODE  AND ReleaseMode <> enumDB_RELEASE_IN_PRESERVE_MODE AND ReleaseMode <> enumDB_RELEASE_IN_CLOSED_MODE AND ReleaseMode <> enumDB_RELEASE_IN_CCB_MODE AND canActionControlInProject("MergeRelease") ) _
-
 
376
      OR ( ReleaseMode = enumDB_RELEASE_IN_CCB_MODE AND canActionControlInProject("MergeReleaseForCCB") ) Then
375
   If releaseIsMergable(ReleaseMode) Then
377
 
-
 
378
      Call objBtnControl.Active ( "btnApproveMerge", "Y" )
376
      Call objBtnControl.Active ( "btnApproveMerge", "Y" )
379
      Call objBtnControl.Active ( "btnRejectPackage", "Y" )
377
      Call objBtnControl.Active ( "btnRejectPackage", "Y" )
380
   Else
378
   Else
381
      Call objBtnControl.Active ( "btnApproveMerge", "N" )
379
      Call objBtnControl.Active ( "btnApproveMerge", "N" )
382
      Call objBtnControl.Active ( "btnRejectPackage", "N" )
380
      Call objBtnControl.Active ( "btnRejectPackage", "N" )