Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

bin/src/main/webapp/js/app/config.js

@@ -602,7 +602,7 @@ function fn_make_select_upper_menu(options, select_id, all_show_yn, all_name) {
 		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
 	}
 	$.each(options, function(key, value) {
-		if (value.level == 2) {
+		if (value.level == 3) {
 			$('<option/>', {
 	            'value': value.menuNo,
 	            'text': value.menuNm

src/main/webapp/js/app/config.js

@@ -602,7 +602,7 @@ function fn_make_select_upper_menu(options, select_id, all_show_yn, all_name) {
 		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
 	}
 	$.each(options, function(key, value) {
-		if (value.level == 2) {
+		if (value.level == 3) {
 			$('<option/>', {
 	            'value': value.menuNo,
 	            'text': value.menuNm

src/main/webapp/js/app/locales/locale-ko.js

@@ -127,7 +127,8 @@ const ITP_MSG_LOCALE = (function() {
 			"stNm": "상태",
 			"ownerNm": "대표자명",
 			"rprstTelNo": "대표연락처",
-			"joinDt": "가입일자"
+			"joinDt": "가입일자",
+			"writeYn": "쓰기여부"
 		},
 		"table": {
 			"brandId": "브랜드ID",

src/main/webapp/js/app/system/ITP_SYSTEM03010.js

@@ -239,12 +239,12 @@ var itp_fn_SYSTEM03010_detail_grid = {
 					editoptions: {maxlength: 128}
 				},
 				{
-					index: 'CONN_URL', name: 'connUrl',
-					label: ITP_MSG_LOCALE.label.actionUrl,
-					width: '18', fixed: false, align: 'left',
-					sortable: false, editable: true, edittype: 'text',
-					editrules: {required: false},
-					editoptions: {maxlength: 128}
+					index: 'WRITE_YN', name: 'writeYn',
+					label: ITP_MSG_LOCALE.label.writeYn,
+					width: '8', fixed: false, align: 'center',
+					sortable: false, editable: true, formatter: 'checkbox', edittype: 'checkbox',
+					editoptions: {value: 'Y:N', defaultValue: 'Y'},
+					editrules: {required: true}
 				},
 				{
 					index: 'USE_YN', name: 'useYn',

src/main/webapp/js/app/system/ITP_SYSTEM04010.js

@@ -114,10 +114,22 @@ require(['config'], function() {
 						$.each(rowData, function(key, value) {
 							if (value.viewCd != 'R') {
 								value.authNo = keyValue;
+								
+								if (value.readYn == 'N' && value.writeYn == 'Y') {
+									value.readYn = 'Y';
+								}
+								
 								if (value.viewCd == 'C') {
 									gridInsertData.push(value);
 								} else if (value.viewCd == 'U') {
-									gridUpdateData.push(value);
+									
+									if (value.readYn == 'N' && value.writeYn == 'N') {
+										value.viewCd = 'D';
+										gridDeleteData.push(value);
+									} else {
+										gridUpdateData.push(value);
+									}
+									
 								}
 							}
 						});