메인전시 수정

src/main/java/com/style24/admin/biz/service/TsaDisplayService.java

@@ -578,7 +578,9 @@ public class TsaDisplayService {
 				Contents contentsTmp = new Contents();
 				contentsTmp.setCateNo(contents.getCateNo());
 				contentsTmp.setContentsLoc(contents.getContentsLoc());
-				contentsTmp.setBrandGroupNo(contents.getBrandGroupNo());
+				if("1711".equals(contents.getCateNo())){
+					contentsTmp.setBrandGroupNo(contents.getBrandGroupNo());
+				}
 				contentsTmp.setContentsTitle(contents.getContentsTitle());
 				contentsTmp.setRegNo(TsaSession.getInfo().getUserNo());
 				displayDao.deleteContentsTitle(contentsTmp);

src/main/webapp/WEB-INF/views/display/MainMultiContentsPopupForm.html

@@ -29,9 +29,9 @@
 						<button type="button" class="btn btn btn-base btn-sm" th:if="${contentsLoc == 'SMM007'}" onclick="fnAddBrand(this);">브랜드 추가</button> <!--id="btnBrandAddRow"-->
 						<button type="button" class="btn btn btn-base btn-sm" th:if="${contentsLoc == 'SMM009'}" onclick="fnAddBrand(this);">MD 탭 추가</button>
 						<button type="button" class="btn btn btn-dark btn-sm" id="btnMultiPopSave">임시저장</button>
-						<input type="hidden" name="uploadDefaultUrlMultiPop" id="uploadDefaultUrlMultiPop" th:value="${@environment.getProperty('upload.image.view') + '/display/contents/'}"/>
-						<input type="hidden" name="uploadDefaultBrandUrlPop" id="uploadDefaultBrandUrlPop" th:value="${@environment.getProperty('upload.image.view') + '/display/contents/brand/'}"/>
-						<input type="hidden" name="uploadDefaultPlanUrlPop" id="uploadDefaultPlanUrlPop" th:value="${@environment.getProperty('upload.image.view') + '/display/contents/plan/'}"/>
+						<input type="hidden" name="uploadDefaultUrlMultiPop" id="uploadDefaultUrlMultiPop" th:value="${@environment.getProperty('upload.image.view') + '/contents/'}"/>
+						<input type="hidden" name="uploadDefaultBrandUrlPop" id="uploadDefaultBrandUrlPop" th:value="${@environment.getProperty('upload.image.view') + '/contents/brand/'}"/>
+						<input type="hidden" name="uploadDefaultPlanUrlPop" id="uploadDefaultPlanUrlPop" th:value="${@environment.getProperty('upload.image.view') + '/contents/planning/'}"/>
 					</li>
 				</ul>
 			</div>
@@ -126,7 +126,7 @@
 				html += '<button type="button" class="btn btnRight btn-success btn-lg" onclick="fnGetBrandGroup(this);">브랜드조회</button>';
 				html += '</td>';
 				html += '</tr>';
-				html += fnAddBrandImgRow(result[i].brandGroupImg);
+				/*html += fnAddBrandImgRow(result[i].brandGroupImg);*/
 			}
 			html += '</thead><tbody>';
 			if(contentsLoc=='SMM007') {
@@ -243,7 +243,7 @@
 			html += '<button type="button" class="btn btnRight btn-success btn-lg" onclick="fnGetBrandGroup(this);">브랜드조회</button>';
 			html += '</td>';
 			html += '</tr>';
-			html += '<tr name="brandImgRow">';
+/*			html += '<tr name="brandImgRow">';
 			html += '<th>브랜드이미지</th>';
 			html += '<td colspan="3">';
 			html += '	<div class="uFile w300">';
@@ -261,7 +261,7 @@
 			html += '	<img id="brandPreViewUrlPop_' + brandIdx + '" src="" style="height:100px; max-width:500px;" onclick="cfnOpenImagePreViewPopup(\'brandPreViewUrlPop\',$(this).attr(\'src\'));"/>';
 			html += '	</div>';
 			html += '</td>';
-			html += '</tr>';
+			html += '</tr>';*/
 		}
 		html += '</thead><tbody></tbody></table>';
 
@@ -337,7 +337,7 @@
 		var src = '';
 		var imgPath = '';
 		if(typeof param!='object'){
-			src = $("#uploadDefaultPlanUrlPop").val().replace('/contents/plan/', '')+param;
+			src = $("#uploadDefaultPlanUrlPop").val().replace('/contents/planning/', '')+param;
 			imgPath = param;
 		}
 		var html = '<tr name="planRow">';
@@ -710,7 +710,7 @@
 	}
 
 	var firstOrd = '';
-	var uploadGoodsUrl = "image.istyle24.com/Upload/ProductImage";//[[${@environment.getProperty('upload.goods.view')}]];
+	var uploadGoodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
 	var fnAddMultiContentsGoods = function(result){
 		console.log('goodsRowIdx>>>>'+addRowTd);
 		var html='';