Subversion Repositories DevTools

Rev

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

Rev 4631 Rev 4980
Line 48... Line 48...
48
Sub GetPackageInfo( nPvId, outPkgInfo )
48
Sub GetPackageInfo( nPvId, outPkgInfo )
49
   Dim rsTemp, Query_String
49
   Dim rsTemp, Query_String
50
   If (IsEmpty(nPvId) OR newPackage > 0) Then Exit Sub
50
   If (IsEmpty(nPvId) OR newPackage > 0) Then Exit Sub
51
 
51
 
52
   Query_String = _
52
   Query_String = _
53
   " SELECT pv.pv_id, pkg.pkg_id, pkg.pkg_name, pv.pkg_version, pv.v_ext, pv.change_type, pv.build_type"&_
53
   " SELECT pv.pv_id, pkg.pkg_id, pkg.pkg_name, pv.pkg_version, pv.v_ext, pv.change_type, pv.build_type, pv.is_patch"&_
54
   "  FROM packages pkg, package_versions pv"&_
54
   "  FROM packages pkg, package_versions pv"&_
55
   " WHERE pkg.pkg_id = pv.pkg_id  AND pv.pv_id ="& nPvId
55
   " WHERE pkg.pkg_id = pv.pkg_id  AND pv.pv_id ="& nPvId
56
 
56
 
57
   Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
57
   Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
58
 
58
 
Line 62... Line 62...
62
      outPkgInfo.Item("pkg_name") = rsTemp.Fields("pkg_name")
62
      outPkgInfo.Item("pkg_name") = rsTemp.Fields("pkg_name")
63
      outPkgInfo.Item("pkg_version") = rsTemp.Fields("pkg_version")
63
      outPkgInfo.Item("pkg_version") = rsTemp.Fields("pkg_version")
64
      outPkgInfo.Item("change_type") = rsTemp.Fields("change_type")
64
      outPkgInfo.Item("change_type") = rsTemp.Fields("change_type")
65
      outPkgInfo.Item("build_type") = rsTemp.Fields("build_type")
65
      outPkgInfo.Item("build_type") = rsTemp.Fields("build_type")
66
 
66
 
-
 
67
      If rsTemp.Fields("is_patch") = "Y" Then
-
 
68
        outPkgInfo.Item("is_patch") = "true"
-
 
69
      Else
-
 
70
        outPkgInfo.Item("is_patch") = "false"
-
 
71
      End If
-
 
72
 
67
      if rsTemp.Fields("v_ext") <> "" Then
73
      if rsTemp.Fields("v_ext") <> "" Then
68
        outPkgInfo.Item("v_ext") = rsTemp.Fields("v_ext")
74
        outPkgInfo.Item("v_ext") = rsTemp.Fields("v_ext")
69
      Else
75
      Else
70
        outPkgInfo.Item("v_ext") = ""
76
        outPkgInfo.Item("v_ext") = ""
71
      End If
77
      End If
Line 585... Line 591...
585
        var versionExt = document.all['v_ext'].value;
591
        var versionExt = document.all['v_ext'].value;
586
        var versionBase = document.all['FRvnumber'].value;
592
        var versionBase = document.all['FRvnumber'].value;
587
        document.all['FRnewver'].value = versionBase + versionExt;
593
        document.all['FRnewver'].value = versionBase + versionExt;
588
 
594
 
589
        // check the version number is good
595
        // check the version number is good
590
        MM_validateForm("--Silent",{vBase:versionBase, vExt:versionExt},'Version Number','RisVersionNumber');
596
        MM_validateForm("--Silent",{vBase:versionBase, vExt:versionExt, isPatch:<%=objPkgInfo.Item("is_patch")%>},'Version Number','RisVersionNumber');
591
        if ( ! document.MM_returnValue )
597
        if ( ! document.MM_returnValue )
592
        {
598
        {
593
            addClass(document.getElementById('FRvnumber'), 'form_error' );
599
            addClass(document.getElementById('FRvnumber'), 'form_error' );
594
            setIdText('vnError','Invalid form');
600
            setIdText('vnError','Invalid form');
595
            showeMessage(document.MM_error);
601
            showeMessage(document.MM_error);
Line 941... Line 947...
941
                                    <table>
947
                                    <table>
942
                                        <tr>
948
                                        <tr>
943
                                            <td background="images/bg_form_lightgray.gif" class="form_txt">
949
                                            <td background="images/bg_form_lightgray.gif" class="form_txt">
944
                                            <input name="build_type1" id="build_type_A" type="radio" value="A" checked onclick="changeToAutoBuild('A');"> Auto
950
                                            <input name="build_type1" id="build_type_A" type="radio" value="A" checked onclick="changeToAutoBuild('A');"> Auto
945
                                            <input name="build_type1" id="build_type_M" type="radio" value="M" onclick="changeToAutoBuild('M');"> Manual
951
                                            <input name="build_type1" id="build_type_M" type="radio" value="M" onclick="changeToAutoBuild('M');"> Manual
-
 
952
                                            <%=objPkgInfo.Item("is_patch")%>
946
                                        </td>
953
                                        </td>
947
                                    </table>
954
                                    </table>
948
                                 </tr>
955
                                 </tr>
949
                                 <!--Version Number Assignment -------------->
956
                                 <!--Version Number Assignment -------------->
950
                                 <tr>
957
                                 <tr>