Subversion Repositories DevTools

Rev

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

Rev 4198 Rev 4203
Line 218... Line 218...
218
    bDisableAuto = bIsCots and not HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
218
    bDisableAuto = bIsCots and not HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
219
    'Enable only the "Patch Change" option if the package is a COTS package and the version has a patch-build number.
219
    'Enable only the "Patch Change" option if the package is a COTS package and the version has a patch-build number.
220
    bPatchOnly = bIsCots and not HasWellFormedVersion(objPkgInfo.Item("pkg_version")) and HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
220
    bPatchOnly = bIsCots and not HasWellFormedVersion(objPkgInfo.Item("pkg_version")) and HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
221
 
221
 
222
    ' Use existing change type and build type
222
    ' Use existing change type and build type
223
    bIsAuto = objPkgInfo.Item("build_type") = "A" AND NOT bDisableAuto
223
    bIsAuto = objPkgInfo.Item("change_type") <> "F" AND NOT bDisableAuto
224
 
224
 
225
    majorState = ""
225
    majorState = ""
226
    minorState = ""
226
    minorState = ""
227
    patchState = ""
227
    patchState = ""
228
    If objPkgInfo.Item("change_type") = "M" Then
228
    If objPkgInfo.Item("change_type") = "M" Then
Line 284... Line 284...
284
   checkMode = 0;
284
   checkMode = 0;
285
 
285
 
286
   savedVersion = "<%=verNumber%>";
286
   savedVersion = "<%=verNumber%>";
287
   document.getElementById('FRvnumber').value = savedVersion;
287
   document.getElementById('FRvnumber').value = savedVersion;
288
 
288
 
289
   var isAutobuild = document.NEWversion.build_type[0].checked;
289
   var isAutobuild = document.NEWversion.version_type[0].checked;
290
   if (!isAutobuild)
290
   if (!isAutobuild)
291
   {
291
   {
292
      changeToManualVersionNumberAssignment();
292
      changeToManualVersionNumberAssignment();
293
   }
293
   }
294
   else
294
   else
Line 316... Line 316...
316
//
316
//
317
// Purpose: Hide the relevent sections of the form
317
// Purpose: Hide the relevent sections of the form
318
//
318
//
319
function changeToAutoVersionNumberAssignment()
319
function changeToAutoVersionNumberAssignment()
320
{
320
{
321
   document.getElementById('change_type').style.display = 'table-row';
321
   document.getElementById('change_type1').style.display = 'table-row';
322
   //document.getElementById('pkgver').style.display = 'none';
322
   //document.getElementById('pkgver').style.display = 'none';
323
   savedVersion = document.getElementById('FRvnumber').value;
323
   savedVersion = document.getElementById('FRvnumber').value;
324
   document.getElementById('FRvnumber').disabled = true;
324
   document.getElementById('FRvnumber').disabled = true;
325
   document.getElementById('FRvnumber').value = '(auto)';
325
   document.getElementById('FRvnumber').value = '(auto)';
326
   checkVersionNumber();
326
   checkVersionNumber();
Line 331... Line 331...
331
//
331
//
332
// Purpose: Show the relevent sections of the form
332
// Purpose: Show the relevent sections of the form
333
//
333
//
334
function changeToManualVersionNumberAssignment()
334
function changeToManualVersionNumberAssignment()
335
{
335
{
336
   document.getElementById('change_type').style.display = 'none';
336
   document.getElementById('change_type1').style.display = 'none';
337
   //document.getElementById('pkgver').style.display = 'table-row';
337
   //document.getElementById('pkgver').style.display = 'table-row';
338
   document.getElementById('FRvnumber').disabled = false;
338
   document.getElementById('FRvnumber').disabled = false;
339
   document.getElementById('FRvnumber').value = savedVersion;
339
   document.getElementById('FRvnumber').value = savedVersion;
340
   checkVersionNumber();
340
   checkVersionNumber();
341
}
341
}
Line 424... Line 424...
424
}
424
}
425
 
425
 
426
function checkVersionNumber()
426
function checkVersionNumber()
427
{
427
{
428
   reseteMessage();
428
   reseteMessage();
429
   if (document.NEWversion.build_type[0].checked)
429
   if (document.NEWversion.version_type[0].checked)
430
   {
430
   {
431
        removeClass(document.getElementById('FRvnumber'), 'form_error' );
431
        removeClass(document.getElementById('FRvnumber'), 'form_error' );
432
        setIdText('vnError','');
432
        setIdText('vnError','');
433
 
433
 
434
        var versionExt = document.all['v_ext'].value;
434
        var versionExt = document.all['v_ext'].value;
Line 528... Line 528...
528
        removeClass(document.getElementById('FRreason'), 'form_error' );
528
        removeClass(document.getElementById('FRreason'), 'form_error' );
529
        //setIdText('frError','');
529
        //setIdText('frError','');
530
    }
530
    }
531
}
531
}
532
 
532
 
533
<%If parRename <> "" Then%>
-
 
534
function getCheckedRadio(radio_group) {
533
function getCheckedRadio(radio_group) {
535
    for (var i = 0; i < radio_group.length; i++) {
534
    for (var i = 0; i < radio_group.length; i++) {
536
        var button = radio_group[i];
535
        var button = radio_group[i];
537
        if (button.checked) {
536
        if (button.checked) {
538
            return button;
537
            return button;
539
        }
538
        }
540
    }
539
    }
541
    return undefined;
540
    return undefined;
542
}
541
}
543
 
542
 
-
 
543
<%If parRename <> "" Then%>
544
function updateVersionInfo()
544
function updateVersionInfo()
545
{
545
{
546
   reseteMessage();
546
   reseteMessage();
547
 
547
 
548
    xmlHttp=GetXmlHttpObject(updateVersionInfoDone);
548
    xmlHttp=GetXmlHttpObject(updateVersionInfoDone);
Line 553... Line 553...
553
    }
553
    }
554
 
554
 
555
    var url = "_json_updateVersion.asp?"
555
    var url = "_json_updateVersion.asp?"
556
            + "packageName=" + document.getElementById('FRpkgName').value
556
            + "packageName=" + document.getElementById('FRpkgName').value
557
            + "&Version=" + document.all['FRvnumber'].value + document.all['v_ext'].value
557
            + "&Version=" + document.all['FRvnumber'].value + document.all['v_ext'].value
558
            + "&buildType=" + getCheckedRadio(document.forms.NEWversion.elements.build_type).value
558
            + "&buildType=" + document.forms.NEWversion.elements.build_type.value
559
            + "&changeType=" + getCheckedRadio(document.forms.NEWversion.elements.change_type).value
559
            + "&changeType=" + document.all['change_type'].value
560
            + "&rtagId=" + document.all['rtag_id'].value
560
            + "&rtagId=" + document.all['rtag_id'].value
561
            + "&pvId=" + document.all['OLDpv_id'].value
561
            + "&pvId=" + document.all['OLDpv_id'].value
562
            + "&vExt=" + document.all['v_ext'].value
562
            + "&vExt=" + document.all['v_ext'].value
563
            + "&Opr=updateVer";
563
            + "&Opr=updateVer";
564
 
564
 
Line 665... Line 665...
665
        <%If NOT parRename <> "" Then%>
665
        <%If NOT parRename <> "" Then%>
666
        checkReason();
666
        checkReason();
667
        <%End If%>
667
        <%End If%>
668
        if (!fieldError)
668
        if (!fieldError)
669
        {
669
        {
-
 
670
            //  Export the change_type field in a sanitised form
-
 
671
            var ct = getCheckedRadio(document.forms.NEWversion.elements.change_type1).value;
-
 
672
            if(!document.NEWversion.version_type[0].checked) ct = 'F';
-
 
673
            document.all['change_type'].value = ct;
-
 
674
 
670
            MM_showProgressBar();
675
            MM_showProgressBar();
671
            <%If parRename <> "" Then%>
676
            <%If parRename <> "" Then%>
672
                updateVersionInfo();
677
                updateVersionInfo();
673
                if (!fieldError)
678
                if (!fieldError)
674
                {
679
                {
Line 781... Line 786...
781
                                        <td background="images/bg_form_lightbluedark.gif" width="20%" class="form_field"></td>
786
                                        <td background="images/bg_form_lightbluedark.gif" width="20%" class="form_field"></td>
782
                                        <td background="images/bg_form_lightbluedark.gif" class="form_field"></td>
787
                                        <td background="images/bg_form_lightbluedark.gif" class="form_field"></td>
783
                                    </tr>
788
                                    </tr>
784
                                 <% End If %>
789
                                 <% End If %>
785
 
790
 
-
 
791
                                 <!-- Build Type Assignment ----------------->
-
 
792
                                 <!-- Currently only Automated builds are supported in this dialog -->
-
 
793
                                 <!-- Use a hidden input element to force the value into other pages -->
-
 
794
                                 <tr>
-
 
795
                                    <input type="hidden" name="build_type" id="build_type" value="A">
-
 
796
                                    <td background="images/bg_form_lightbluedark.gif" width="20%" class="form_field">Build Type</td>
-
 
797
                                    <td background="images/bg_form_lightgray.gif" class="form_txt">
-
 
798
                                    <table>
-
 
799
                                        <tr>
-
 
800
                                            <td background="images/bg_form_lightgray.gif" class="form_txt">
-
 
801
                                        
-
 
802
                                            <input disabled name="build_type1" id="build_type1" type="radio" value="A" checked> Auto
-
 
803
                                            <input disabled name="build_type1" id="build_type1" type="radio" value="M" > Manual
-
 
804
                                        </td>
-
 
805
                                    </table>
-
 
806
                                 </tr>
786
                                 <!--Version Number Assignment -------------->
807
                                 <!--Version Number Assignment -------------->
787
                                 <tr>
808
                                 <tr>
788
                                    <td background="images/bg_form_lightbluedark.gif" width="20%" class="form_field">Version Number Assignment</td>
809
                                    <td background="images/bg_form_lightbluedark.gif" width="20%" class="form_field">Version Number Assignment</td>
789
                                    <td background="images/bg_form_lightgray.gif" class="form_txt">
810
                                    <td background="images/bg_form_lightgray.gif" class="form_txt">
790
                                       <%
811
                                       <%
Line 804... Line 825...
804
                                       %>
825
                                       %>
805
                                        <table>
826
                                        <table>
806
                                        <tr>
827
                                        <tr>
807
                                            <td background="images/bg_form_lightgray.gif" class="form_txt">
828
                                            <td background="images/bg_form_lightgray.gif" class="form_txt">
808
                                        
829
                                        
809
                                            <input name="build_type" id="build_type" type="radio" value="A" <%=flagAuto%> onclick="changeToAutoVersionNumberAssignment();"> Auto
830
                                            <input name="version_type" id="version_type" type="radio" value="A" <%=flagAuto%> onclick="changeToAutoVersionNumberAssignment();"> Auto
810
                                            <input name="build_type" id="build_type" type="radio" value="M" <%=flagMan%> onclick="changeToManualVersionNumberAssignment();"> Manual
831
                                            <input name="version_type" id="version_type" type="radio" value="M" <%=flagMan%> onclick="changeToManualVersionNumberAssignment();"> Manual
811
                                        </td>
832
                                        </td>
-
 
833
 
812
                                        </table>
834
                                        </table>
813
                                    </td>
835
                                    </td>
814
                                 </tr>
836
                                 </tr>
815
 
837
 
816
                                 <!-- New Version Number -->
838
                                 <!-- New Version Number -->
Line 884... Line 906...
884
                                       <textarea name="FRreason" id="FRreason" class="form_item" style="width: 420px; height: 150px" onBlur="checkReason()"></textarea>
906
                                       <textarea name="FRreason" id="FRreason" class="form_item" style="width: 420px; height: 150px" onBlur="checkReason()"></textarea>
885
                                        <span id="frError"></span>
907
                                        <span id="frError"></span>
886
                                    </td>
908
                                    </td>
887
                                 </tr>
909
                                 </tr>
888
                                <%End If%>
910
                                <%End If%>
889
                                <tr id="change_type">
911
                                <tr id="change_type1">
890
                                   <td background="images/bg_form_lightbluedark.gif" nowrap width="20%" class="form_field">Change Type</td>
912
                                   <td background="images/bg_form_lightbluedark.gif" nowrap width="20%" class="form_field">Change Type</td>
891
                                   <td background="images/bg_form_lightgray.gif" >
913
                                   <td background="images/bg_form_lightgray.gif" >
892
                                      <table width="100%" border="0" cellspacing="0" cellpadding="0">
914
                                      <table width="100%" border="0" cellspacing="0" cellpadding="0">
893
                                         <tr>
915
                                         <tr>
894
                                            <td width="1%">
916
                                            <td width="1%">
895
                                              <%If bPatchOnly Then majorState = "disabled" %>
917
                                              <%If bPatchOnly Then majorState = "disabled" %>
896
                                              <input name="change_type" type="radio" value="M" <%=majorState%>>
918
                                              <input name="change_type1" type="radio" value="M" <%=majorState%>>
897
                                            </td>
919
                                            </td>
898
                                            <td nowrap>
920
                                            <td nowrap>
899
                                               <span class="form_field">Major Change</span>
921
                                               <span class="form_field">Major Change</span>
900
                                            </td>
922
                                            </td>
901
                                            <td>&nbsp;</td>
923
                                            <td>&nbsp;</td>
Line 907... Line 929...
907
                                            <td colspan="4"><hr width="100%" size="1" noshade></td>
929
                                            <td colspan="4"><hr width="100%" size="1" noshade></td>
908
                                         </tr>
930
                                         </tr>
909
                                         <tr>
931
                                         <tr>
910
                                            <td width="1%">
932
                                            <td width="1%">
911
                                              <%If bPatchOnly Then minorState = "disabled" %>
933
                                              <%If bPatchOnly Then minorState = "disabled" %>
912
                                              <input name="change_type" type="radio" value="N" <%=minorState%>>
934
                                              <input name="change_type1" type="radio" value="N" <%=minorState%>>
913
                                            </td>
935
                                            </td>
914
                                            <td align="center" nowrap>
936
                                            <td align="center" nowrap>
915
                                               <span class="form_field">Minor Change</span>
937
                                               <span class="form_field">Minor Change</span>
916
                                            </td>
938
                                            </td>
917
                                            <td>&nbsp;</td>
939
                                            <td>&nbsp;</td>
Line 922... Line 944...
922
                                         <tr>
944
                                         <tr>
923
                                            <td colspan="4"><hr width="100%" size="1" noshade></td>
945
                                            <td colspan="4"><hr width="100%" size="1" noshade></td>
924
                                         </tr>
946
                                         </tr>
925
                                         <tr>
947
                                         <tr>
926
                                            <td width="1%">
948
                                            <td width="1%">
927
                                               <input name="change_type" type="radio" value="P" <%=patchState%>>
949
                                               <input name="change_type1" type="radio" value="P" <%=patchState%>>
928
                                            </td>
950
                                            </td>
929
                                            <td nowrap>
951
                                            <td nowrap>
930
                                               <span class="form_field">Patch Change</span>
952
                                               <span class="form_field">Patch Change</span>
931
                                            </td>
953
                                            </td>
932
                                            <td>&nbsp;</td>
954
                                            <td>&nbsp;</td>
Line 940... Line 962...
940
                                </tr>
962
                                </tr>
941
                                 <tr>
963
                                 <tr>
942
                                    <td nowrap><img src="images/h_trsp_dot.gif" width="120" height="1"></td>
964
                                    <td nowrap><img src="images/h_trsp_dot.gif" width="120" height="1"></td>
943
                                    <td></td>
965
                                    <td></td>
944
                                 </tr>
966
                                 </tr>
-
 
967
                                 <input type="hidden" name="change_type" id="change_type" value="X">
945
                                 <input type="hidden" name="FRnewver" id="FRnewver" value="hello">
968
                                 <input type="hidden" name="FRnewver" id="FRnewver" value="hello">
946
                                 <input type="hidden" name="OLDpv_id" value="<%=parPv_id%>">
969
                                 <input type="hidden" name="OLDpv_id" value="<%=parPv_id%>">
947
                                 <input type="hidden" name="rtag_id" value="<%=parRtag_id%>">
970
                                 <input type="hidden" name="rtag_id" value="<%=parRtag_id%>">
948
                                 <input type="hidden" name="newPackage" value="<%=newPackage%>">
971
                                 <input type="hidden" name="newPackage" value="<%=newPackage%>">
949
                                 <% if NOT (newPackage > 0) Then %>
972
                                 <% if NOT (newPackage > 0) Then %>