Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev'

getTokenで取得するデータ修正

See merge request !62

abweb/common/js/common.js

@@ -144,8 +144,8 @@ COMMON.displayAlert = function (msgCode, isError) {
     $('#msgModel').html(I18N.i18nText(msgCode));
     $('#msgModel').html(I18N.i18nText(msgCode));
     $('#confirmYes').hide();
     $('#confirmYes').hide();
     $('#confirmNo').text(I18N.i18nText("confirmation"));
     $('#confirmNo').text(I18N.i18nText("confirmation"));
-    $('#modalTitle').text(I18N.i18nText("error"));
     if (isError) {
     if (isError) {
+        $('#modalTitle').text(I18N.i18nText("error"));
     }
     }
     // $('.alert-overlay').removeClass('d-none');
     // $('.alert-overlay').removeClass('d-none');
     // $('.alert-area').removeClass('d-none');
     // $('.alert-area').removeClass('d-none');

abweb/js/setting/settings.js

@@ -25,7 +25,11 @@ SETTINGS.getToken = function () {
     const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_GET_TOKEN;
     const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_GET_TOKEN;
     COMMON.cmsAjax(url, params, false, 
     COMMON.cmsAjax(url, params, false, 
     function(data) {
     function(data) {
-        $('#getToken').val(data);
+        if (data.token) {
+            $('#getToken').val(data.token);
+        } else {
+            COMMON.displayAlert("token error..", true);
+        }
     }, 
     }, 
     function(data) {
     function(data) {
         if (data.errorMessage) {
         if (data.errorMessage) {
@@ -106,10 +110,6 @@ SETTINGS.dspPwdUpd1_Click = function (e) {
             token: getToken,
             token: getToken,
             appId: 4,
             appId: 4,
         };
         };
-        // if (SETTINGS.TOKEN_VALUE != getToken) {
-        //     COMMON.displayAlert("error");
-        //     return;
-        // }
         const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
         const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
         COMMON.cmsAjax(url, params, false, SETTINGS.avwCmsApi_passwordChange_success, SETTINGS.avwCmsApi_passwordChange_fail);
         COMMON.cmsAjax(url, params, false, SETTINGS.avwCmsApi_passwordChange_success, SETTINGS.avwCmsApi_passwordChange_fail);
     } else {
     } else {