Remove WITH from license combination

70825 · Aug 21, 2023 · 6803fd3 · 6803fd3
1 parent 5b1a8f7
commit 6803fd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/webapp/WEB-INF/views/admin/oss/ossAnalysisResultDetailpopup.jsp b/src/main/webapp/WEB-INF/views/admin/oss/ossAnalysisResultDetailpopup.jsp
@@ -880,7 +880,7 @@
 					colModel:[
 						{name:'no', index: 'ossLicenseIdx', width:18, hidden:true},
 						{name:'ossLicenseIdx', index: 'ossLicenseIdx', width:18, key:true, hidden:true},
-						{name:'ossLicenseComb',index:'ossLicenseComb', width:40, align:"center", sortable:false, editable:true, edittype:"select", editoptions:{value:"AND:AND;OR:OR;WITH:WITH", dataEvents:[{type:'change', fn:grid_fn.changeLicenseType(_target, seq)}]}},
+						{name:'ossLicenseComb',index:'ossLicenseComb', width:40, align:"center", sortable:false, editable:true, edittype:"select", editoptions:{value:"AND:AND;OR:OR", dataEvents:[{type:'change', fn:grid_fn.changeLicenseType(_target, seq)}]}},
 						{name:'licenseNameEx',index:'licenseNameEx', width:100, editable:true
 							, editoptions: {
 								dataInit: function (elem) {
@@ -2052,4 +2052,4 @@
 			</div>
 		</div>
 	</body>
-</html>
+</html>
diff --git a/src/main/webapp/WEB-INF/views/admin/oss/view-js.jsp b/src/main/webapp/WEB-INF/views/admin/oss/view-js.jsp
@@ -242,7 +242,7 @@
 			colNames:['','','License', 'Copyright','',''],
 			colModel:[
 				{name:'no', index: 'no', key:true, hidden:true},
-				{name:'ossLicenseComb',index:'ossLicenseComb', width:70, align:"center", sortable:false, edittype:"select", editoptions:{value:"AND:AND;OR:OR;WITH:WITH"}},
+				{name:'ossLicenseComb',index:'ossLicenseComb', width:70, align:"center", sortable:false, edittype:"select", editoptions:{value:"AND:AND;OR:OR"}},
 				{name:'licenseNameEx',index:'licenseNameEx', width:300, editable:false},
 				{name:'ossCopyright',index:'ossCopyright', width:400, edittype:"textarea"},
 				{name:'licenseName',index:'licenseName', width:50, editable:true,hidden:true},
@@ -729,4 +729,4 @@
     		$("#disp_licenseText").html("");
     	}
     }
-</script>
+</script>