Przeglądaj źródła

summernote upload 경로 변경에 따른 수정

eskim 5 lat temu
rodzic
commit
731e01259e

+ 12 - 1
src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -654,7 +654,7 @@
 		</div>	<!--  class=panelStyle -->
 	</div> <!--  class=modalPopup -->
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2020103001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 
@@ -2385,6 +2385,17 @@
 
 		fnGoodsDeailSearch();
 		
+		// Create a summernote
+		var snOptions = gagaSn.getToolbarOptions('media');
+		gagaSn.createSummernote(snOptions, '#goodsContentsDesc');
+		gagaSn.createSummernote(snOptions, '#goodsCharacterDesc');
+		gagaSn.createSummernote(snOptions, '#goodsDesc');
+		gagaSn.createSummernote(snOptions, '#goodsPcTopDesc');
+		gagaSn.createSummernote(snOptions, '#goodsMobileTopDesc');
+		gagaSn.createSummernote(snOptions, '#goodsPcDownDesc');
+		gagaSn.createSummernote(snOptions, '#goodsMobileDownDesc');
+		
+		
 	});
 	
 /*]]>*/

+ 1 - 1
src/main/webapp/WEB-INF/views/goods/GoodsNoticeForm.html

@@ -189,7 +189,7 @@
 	</div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2020103001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	

+ 1 - 1
src/main/webapp/WEB-INF/views/goods/GoodsRegisterForm.html

@@ -563,7 +563,7 @@
 		
 	</div>
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2020103001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	

+ 1 - 1
src/main/webapp/WEB-INF/views/marketing/PlanDetailPopupForm.html

@@ -485,7 +485,7 @@
 </div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2020103001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 

+ 1 - 1
src/main/webapp/WEB-INF/views/marketing/PlanTemplatePopupForm.html

@@ -1071,7 +1071,7 @@
 	</div>
 </div>
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2020103001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	

+ 2 - 124
src/main/webapp/ux/js/admin.common.js

@@ -26,6 +26,7 @@ let cfnGetMenuInfo = function(menuId) {
 	loginMenuList.forEach(function(item) {
 		if (menuId == item.menuId) {
 			menu = item;
+			gagajf.setCookie("CK_MENU_ID", menuId, 1); // 쿠키 설정
 			return false;
 		}
 	});
@@ -471,7 +472,7 @@ function cfnChangeCalendar(diff, obj1, obj2, dateFormat) {
 		sdt.setDate(1);
 		edt.setMonth(emonth + 1);
 		edt.setDate(0);
-	} else if (diff == 'lm') {
+	} else if (diff == 'pm') {
 		sdt.setMonth(smonth - 1);
 		sdt.setDate(1);
 		edt.setMonth(emonth);
@@ -793,129 +794,6 @@ function cfnDownloadSampleFile(sampleFileId) {
 		});
 }
 
-/**
- * @type   : function
- * @access : public
- * @desc   : SNS 로그인 Init
- * <pre>
- *     cfnSnsLoginInit();
- * </pre>
- * @param  : -
- * @since  : 2020/02/24
- * @author : Daehyoung
- */
-var callback;
-
-function cfnSnsLoginInit(callback, snsType) {
-
-	callback = snsCallback;
-	// 네이버 로그인 init
-	var redirect_uri = "http://locd.admin.pastelmall.com/common/oAuthignin?snsType=NA";
-    var naverInstance = new naver_id_login("OMmbCMu7ac7GgYWgjlhv", redirect_uri);
-    var state = naverInstance.getUniqState();
-
-    naverInstance.setButton("white", 4,40);
-    naverInstance.setState(state);
-    naverInstance.setPopup();
-    naverInstance.init_naver_id_login();
-
-    if(snsType == 'NA'){
-    	naverLogin.getLoginStatus(function (status) {
-    		if (status) {
-    			/* (5) 필수적으로 받아야하는 프로필 정보가 있다면 callback처리 시점에 체크 */
-    			console.log("### INFO naverLogin : ", naverLogin);
-    			var email = naverLogin.user.getEmail();
-    			if( email == undefined || email == null) {
-    				alert("이메일은 필수정보입니다. 정보제공을 동의해주세요.");
-    				/* (5-1) 사용자 정보 재동의를 위하여 다시 네아로 동의페이지로 이동함 */
-    				naverLogin.reprompt();
-    				return;
-    			}
-    			snsCallback(naverLogin.user);
-    		} else {
-    			console.log("로그인에 실패하였습니다.");
-    		}
-    	});
-    }
-
-    // 카카오 로그인 init
-    if(typeof initCheck == "undefined"){
-    	Kakao.init('f435c12d89ddb9cc6337f4cf0a05fd30');
-		initCheck = true;
-	}
-
-}
-
-/**
- * @type   : function
- * @access : public
- * @desc   : 네이버 로그인
- * <pre>
- *     cfnSnsLogin();
- * </pre>
- * @param  : -
- * @since  : 2020/02/24
- * @author : Daehyoung
- */
-function cfnNaverLogin(callback, snsType) {
-
-}
-/**
- * @type   : function
- * @access : public
- * @desc   : 카카오 로그인
- * <pre>
- *     cfnKakaoLogin();
- * </pre>
- * @param  : -
- * @since  : 2020/02/24
- * @author : Daehyoung
- */
-function cfnKakaoLogin() {
-	Kakao.Auth.loginForm({
-		success: function(authObj) {
-			var kakaoToken = authObj.access_token;
-			Kakao.API.request({
-				url: '/v2/user/me',
-				success: function(res) {
-					var param = {};
-					param.email 			= res.kaccount_email;
-					param.id 				= res.id;
-					param.image 		= res.properties.profile_image;
-					param.nickname 	= res.properties.nickname;
-					snsCallback(param);
-				},
-				fail: function(error) {
-					alert(JSON.stringify(error));
-				}
-			});
-		},
-		fail: function(err) {
-			alert(JSON.stringify(err));
-		}
-	});
-}
-/**
- * @type   : function
- * @access : public
- * @desc   : 구글 로그인
- * <pre>
- *     cfnSnsLogin();
- * </pre>
- * @param  : -
- * @since  : 2020/02/24
- * @author : Daehyoung
- */
-function cfnGoogleLogin(googleUser) {
-	var profile = googleUser.getBasicProfile();
-	var param = {};
-	param.email 			= profile.getEmail();
-	param.id 				= profile.getId();
-	param.image 		= profile.getImageUrl();
-	param.nickname	= profile.getName();
-	snsCallback(param);
-}
-
 /**
  * @type   : function
  * @access : public

+ 1 - 1
src/main/webapp/ux/plugins/gaga/gaga.summernote.js

@@ -135,7 +135,7 @@ var gagaSn = {
 				console.log("================== EDITOR FILE UPLOAD ===================");
 				console.log(data);
 				console.log("================== // EDITOR FILE UPLOAD ===================");
-				$(editorId).summernote('insertImage', data.viewUrl + "/Upload/editor/" + data.newFileName);
+				$(editorId).summernote('insertImage', data.viewUrl + "/editor/" + data.newFileName);
 			}
 		});
 	}

+ 2 - 1
src/main/webapp/ux/plugins/gaga/gaga.validation.js

@@ -961,7 +961,8 @@ var gagajf = {
 			$(tgtId +' #' + fromObj).val(date.format("YYYY-MM-") + '01');
 			$(tgtId +' #' + toObj).val((date.format('YYYY-MM-') + '01').toDate('YYYY-MM-DD').after(0, 1, 0).before(0, 0, 1).format("YYYY-MM-DD"));
 		} else if (type == 'pm') { // 지난달
-			$(tgtId +' #' + fromObj).val(date.before(0, 1, 0).format("YYYY-MM-")  + '01');
+			//$(tgtId +' #' + fromObj).val(date.before(0, 1, 0).format("YYYY-MM-")  + '01');
+			$(tgtId +' #' + fromObj).val((date.format('YYYY-MM-') + '01').toDate('YYYY-MM-DD').before(0, 1, 0).format("YYYY-MM-")  + '01');
 			$(tgtId +' #' + toObj).val((date.format('YYYY-MM-') + '01').toDate('YYYY-MM-DD').before(0, 0, 1).format("YYYY-MM-DD"));
 		} else if (type == '3m') { // 최근3개월
 			$(tgtId +' #' + fromObj).val(date.before(0, 3, 0).after(0, 0, 1).format("YYYY-MM-DD"));