Subversion Repositories DevTools

Rev

Rev 3887 | Rev 3891 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 3887 Rev 3889
Line 22... Line 22...
22
Dim majorState
22
Dim majorState
23
Dim minorState
23
Dim minorState
24
Dim patchState
24
Dim patchState
25
Dim parBase_view_id
25
Dim parBase_view_id
26
Dim verNumber
26
Dim verNumber
-
 
27
Dim parPkgName
27
 
28
 
28
'------------ Constants Declaration -----------
29
'------------ Constants Declaration -----------
29
'------------ Variable Init -------------------
30
'------------ Variable Init -------------------
30
parPv_id = QStrPar("pv_id")
31
parPv_id = QStrPar("pv_id")
31
parBase_view_id = Request("base_view_id")
32
parBase_view_id = Request("base_view_id")
-
 
33
parPkgName = QStrPar("pkgName")
32
 
34
 
33
parPage_title = "NEW VERSION"
35
parPage_title = "NEW VERSION"
34
 
36
 
35
If ( isempty(parPv_id) OR (NOT parPv_id <> "") ) Then
37
If ( parPkgName <> "" ) Then
36
    newPackage = TRUE
38
    newPackage = TRUE
37
ElseIf IsNumeric(parPv_id) Then
-
 
38
    If (parPv_id <= 0) Then
39
    parPv_id = NULL
39
        newPackage = TRUE
-
 
40
    End if
-
 
41
End if
40
End if
42
    
41
    
43
majorState = ""
42
majorState = ""
44
minorState = ""
43
minorState = ""
45
patchState = "checked"
44
patchState = "checked"
Line 183... Line 182...
183
'===================== MAIN LINE ============================
182
'===================== MAIN LINE ============================
184
Dim bDisableAuto, bPatchOnly, bIsCots, bIsAuto
183
Dim bDisableAuto, bPatchOnly, bIsCots, bIsAuto
185
 
184
 
186
If NOT newPackage Then
185
If NOT newPackage Then
187
    Call GetPackageInfo( parPv_id, objPkgInfo )
186
    Call GetPackageInfo( parPv_id, objPkgInfo )
-
 
187
    parPkgName = objPkgInfo.Item("pkg_name")
188
 
188
 
189
    ' Extract version number without extension
189
    ' Extract version number without extension
190
    verNumber = objPkgInfo.Item("pkg_version")
190
    verNumber = objPkgInfo.Item("pkg_version")
191
    verNumber = Mid( verNumber,1, Len(verNumber) - Len(objPkgInfo.Item("v_ext")))
191
    verNumber = Mid( verNumber,1, Len(verNumber) - Len(objPkgInfo.Item("v_ext")))
192
 
192
 
Line 222... Line 222...
222
<!--
222
<!--
223
var savedVersion;
223
var savedVersion;
224
 
224
 
225
window.onload = function(e)
225
window.onload = function(e)
226
{
226
{
227
   document.getElementById('inputVersionNumber').value = "<%=verNumber%>";
227
   document.getElementById('FRvnumber').value = "<%=verNumber%>";
228
 
228
 
229
   var isAutobuild = document.NEWversion.build_type[0].checked;
229
   var isAutobuild = document.NEWversion.build_type[0].checked;
230
   if (!isAutobuild)
230
   if (!isAutobuild)
231
   {
231
   {
232
      changeToManualVersionNumberAssignment();
232
      changeToManualVersionNumberAssignment();
Line 244... Line 244...
244
//
244
//
245
function changeToAutoVersionNumberAssignment()
245
function changeToAutoVersionNumberAssignment()
246
{
246
{
247
   document.getElementById('change_type').style.display = 'table-row';
247
   document.getElementById('change_type').style.display = 'table-row';
248
   //document.getElementById('pkgver').style.display = 'none';
248
   //document.getElementById('pkgver').style.display = 'none';
249
   savedVersion = document.getElementById('inputVersionNumber').value;
249
   savedVersion = document.getElementById('FRvnumber').value;
250
   document.getElementById('inputVersionNumber').disabled = true;
250
   document.getElementById('FRvnumber').disabled = true;
251
   document.getElementById('inputVersionNumber').value = '(auto)';
251
   document.getElementById('FRvnumber').value = '(auto)';
252
}
252
}
253
 
253
 
254
//////////////////////////////////////////////////////////////////
254
//////////////////////////////////////////////////////////////////
255
// Function: changeToManualVersionNumberAssignment
255
// Function: changeToManualVersionNumberAssignment
256
//
256
//
Line 258... Line 258...
258
//
258
//
259
function changeToManualVersionNumberAssignment()
259
function changeToManualVersionNumberAssignment()
260
{
260
{
261
   document.getElementById('change_type').style.display = 'none';
261
   document.getElementById('change_type').style.display = 'none';
262
   document.getElementById('pkgver').style.display = 'table-row';
262
   document.getElementById('pkgver').style.display = 'table-row';
263
   document.getElementById('inputVersionNumber').disabled = false;
263
   document.getElementById('FRvnumber').disabled = false;
264
   document.getElementById('inputVersionNumber').value = savedVersion;
264
   document.getElementById('FRvnumber').value = savedVersion;
265
}
265
}
266
 
266
 
267
 
267
 
268
// Do not remove these next few lines, otherwise the page does not load properly in Microsoft IE.
268
// Do not remove these next few lines, otherwise the page does not load properly in Microsoft IE.
269
//-->
269
//-->
Line 272... Line 272...
272
<script>
272
<script>
273
 
273
 
274
 
274
 
275
function Dependency()
275
function Dependency()
276
{
276
{
-
 
277
<%If newPackage Then%>
-
 
278
   parent.window.location.href="dependencies.asp?rtag_id=<%=parRtag_id%>";
-
 
279
<%Else%>
277
   parent.window.location.href="dependencies.asp?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>";
280
   parent.window.location.href="dependencies.asp?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>";
-
 
281
<%End If%>
278
}
282
}
279
 
283
 
280
////////////////////////////////////////////////////////////////////////////////////////////////////////
284
////////////////////////////////////////////////////////////////////////////////////////////////////////
281
// This function returns true if form validation passes, else false
285
// This function returns true if form validation passes, else false
282
// It is called when a user hits the submit button.
286
// It is called when a user hits the submit button.
Line 292... Line 296...
292
        // New Forms Only
296
        // New Forms Only
293
        //  Check Package Name exists
297
        //  Check Package Name exists
294
        //  Check Base ID has been provided
298
        //  Check Base ID has been provided
295
        if ( f.newPackage.value )
299
        if ( f.newPackage.value )
296
        {
300
        {
297
            MM_validateForm('inputPackageName','Package Name','RisPackage','base_view_id','Base View','R');
301
            MM_validateForm('FRpkgName','Package Name','RisPackage','base_view_id','Base View','R');
298
            if ( ! document.MM_returnValue )
302
            if ( ! document.MM_returnValue )
299
            {
303
            {
300
                return false;
304
                return false;
301
            }
305
            }
302
        }
306
        }
Line 304... Line 308...
304
        // Hide progress bar that is exposed because the previous tests were OK
308
        // Hide progress bar that is exposed because the previous tests were OK
305
        MM_findObj('ProgressBar').style.visibility='hidden';
309
        MM_findObj('ProgressBar').style.visibility='hidden';
306
      
310
      
307
        // Get Full version - store into hidden field processing
311
        // Get Full version - store into hidden field processing
308
        var versionExt = document.all['v_ext'].value;
312
        var versionExt = document.all['v_ext'].value;
309
        var versionBase = document.all['inputVersionNumber'].value;
313
        var versionBase = document.all['FRvnumber'].value;
310
        document.all['FRnewver'].value = versionBase + versionExt;
314
        document.all['FRnewver'].value = versionBase + versionExt;
311
 
315
 
312
        // check the version number is good
316
        // check the version number is good
313
        var isAutobuild = document.NEWversion.build_type[0].checked;
317
        var isAutobuild = document.NEWversion.build_type[0].checked;
314
        document.MM_returnValue = MM_ValidateVersion(null, versionBase, versionExt, isAutobuild, false);
318
        document.MM_returnValue = MM_ValidateVersion(null, versionBase, versionExt, isAutobuild, false);
Line 377... Line 381...
377
                              <table width="100%" border="0" cellspacing="1" cellpadding="5">
381
                              <table width="100%" border="0" cellspacing="1" cellpadding="5">
378
 
382
 
379
                                 <!-- Package Name -->
383
                                 <!-- Package Name -->
380
                                 <tr>
384
                                 <tr>
381
                                    <td background="images/bg_form_lightbluedark.gif" width="20%" class="form_field">Package Name</td>
385
                                    <td background="images/bg_form_lightbluedark.gif" width="20%" class="form_field">Package Name</td>
382
                                    <% if newPackage Then %>
386
                                   <% if newPackage Then %>
383
                                        <td background="images/bg_form_lightgray.gif" class="form_item">
387
                                        <td background="images/bg_form_lightgray.gif" class="form_item">
384
                                          <input type="text" id="inputPackageName" name="inputPackageName" class="form_item" size="40">
388
                                          <input type="text" id="FRpkgName" name="FRpkgName" class="form_item" size="40" value="<%=parPkgName%>">
385
                                        </td>
389
                                        </td>
386
                                    <% Else %>
390
                                    <% Else %>
387
                                        <td background="images/bg_form_lightgray.gif" class="form_field"><%=objPkgInfo.Item("pkg_name")%></td>
391
                                        <td background="images/bg_form_lightgray.gif" class="form_field"><%=parPkgName%></td>
388
                                    <% End If %>
392
                                    <% End If %>
389
                                 </tr>
393
                                 </tr>
390
 
394
 
391
                                 <!--Base View -------------->
395
                                 <!--Base View -------------->
392
                                 <% if newPackage Then %>
396
                                 <% if newPackage Then %>
Line 453... Line 457...
453
                                    <td background="images/bg_form_lightbluedark.gif"  width="20%" class="form_field">New Version Number</td>
457
                                    <td background="images/bg_form_lightbluedark.gif"  width="20%" class="form_field">New Version Number</td>
454
                                    <td>
458
                                    <td>
455
                                        <table>
459
                                        <table>
456
                                        <tr>
460
                                        <tr>
457
                                        <td background="images/bg_form_lightgray.gif" class="form_item">
461
                                        <td background="images/bg_form_lightgray.gif" class="form_item">
458
                                            <input type="text" id="inputVersionNumber"
462
                                            <input type="text" id="FRvnumber"
459
                                                    name="inputVersionNumber"
463
                                                    name="FRvnumber"
460
                                                    class="form_item" size="12">
464
                                                    class="form_item" size="12">
461
                                        </td>
465
                                        </td>
462
                                           <td id="pkgver" background="images/bg_form_lightgray.gif" class="form_item">
466
                                           <td id="pkgver" background="images/bg_form_lightgray.gif" class="form_item">
463
                                           <%If NOT newPackage Then%>
467
                                           <%If NOT newPackage Then%>
464
                                              <select id="FRpkgver"  name="FRpkgver" class="form_item">
468
                                              <select id="FRpkgver"  name="FRpkgver" class="form_item">