-
\ No newline at end of file
+
+
+
+
diff --git a/console/web/error/confirm_pw.html b/console/web/error/confirm_pw.html
index c4d90b4..753f759 100644
--- a/console/web/error/confirm_pw.html
+++ b/console/web/error/confirm_pw.html
@@ -8,7 +8,7 @@
-
\ No newline at end of file
+
diff --git a/console/web/error/js/error.js b/console/web/error/js/error.js
new file mode 100644
index 0000000..2203798
--- /dev/null
+++ b/console/web/error/js/error.js
@@ -0,0 +1,28 @@
+/**
+ * Created by Strawmanbobi
+ * 2017-05-24
+ */
+
+let LS_KEY_ID = "user_name";
+let LS_KEY_TOKEN = "token";
+
+let userLang = "en-US";
+let paramLang = getParameter('lang') || localStorage.getItem(LS_KEY_LANG);
+
+if (paramLang) {
+ localStorage.setItem(LS_KEY_LANG, paramLang);
+} else {
+ // set LANG default to simplified Chinese
+ localStorage.setItem(LS_KEY_LANG, "zh-CN");
+}
+
+userLang = navigator.language || paramLang;
+
+i18n.init(function(err, t) {
+ $(".page_error").i18n({ lng: userLang });
+});
+
+$(document).ready(function() {
+ localStorage.removeItem(LS_KEY_ID);
+ localStorage.removeItem(LS_KEY_TOKEN);
+});
diff --git a/console/web/error/js/password.js b/console/web/error/js/password.js
index 78e5dcb..7734067 100644
--- a/console/web/error/js/password.js
+++ b/console/web/error/js/password.js
@@ -3,24 +3,40 @@
* 2016-12-02
*/
-var LS_KEY_ID = "user_name";
-var LS_KEY_TOKEN = "token";
+let LS_KEY_ID = "user_name";
+let LS_KEY_TOKEN = "token";
+
+let userLang = "en-US";
+let paramLang = getParameter('lang') || localStorage.getItem(LS_KEY_LANG);
+
+if (paramLang) {
+ localStorage.setItem(LS_KEY_LANG, paramLang);
+} else {
+ // set LANG default to simplified Chinese
+ localStorage.setItem(LS_KEY_LANG, "zh-CN");
+}
+
+userLang = navigator.language || paramLang;
+
+i18n.init(function(err, t) {
+ $(".page_error").i18n({ lng: userLang });
+});
$(document).ready(function() {
- var password = getParameter('password');
- var result = getParameter('result');
- var indFrame = $("#plain_password");
- var indContent = "";
+ let password = getParameter('password');
+ let result = getParameter('result');
+ let indFrame = $("#plain_password");
+ let indContent = "";
- if (result == 1) {
- indContent = "修改密码成功，请牢记您的新密码：" + password;
+ if (result === 1) {
+ indContent = i18n.t("page_error.change_pw_success", { lng: userLang }) + password;
} else {
- indContent = "未能成功修改密码";
+ indContent = i18n.t("page_error.change_pw_fail", { lng: userLang });
}
indFrame.empty();
indFrame.html(indContent);
- localstorage.removeItem(LS_KEY_ID);
- localstorage.removeItem(LS_KEY_TOKEN);
-});
\ No newline at end of file
+ localStorage.removeItem(LS_KEY_ID);
+ localStorage.removeItem(LS_KEY_TOKEN);
+});
diff --git a/console/web/error/locales/dev/translation.json b/console/web/error/locales/dev/translation.json
new file mode 100644
index 0000000..b8ba6a5
--- /dev/null
+++ b/console/web/error/locales/dev/translation.json
@@ -0,0 +1,18 @@
+{
+ "app": {
+ "name": "IRext"
+ },
+ "page_error": {
+ "title_error": "控制台错误",
+ "title_confirm_pw": "确认密码",
+ "auth_error": "认证错误",
+ "access_after_login": "请在登录之后访问",
+ "access_to_console": "访问控制台",
+ "change_pw": "修改密码",
+ "register": "用户注册",
+ "change_pw_success": "修改密码成功，请牢记您的新密码：",
+ "change_pw_fail": "未能成功修改密码",
+ "register_success": "注册用户成功，请牢记您的新密码：",
+ "register_fail": "未能成功注册用户"
+ }
+}
diff --git a/console/web/error/locales/en-US/translation.json b/console/web/error/locales/en-US/translation.json
new file mode 100644
index 0000000..a8af076
--- /dev/null
+++ b/console/web/error/locales/en-US/translation.json
@@ -0,0 +1,18 @@
+{
+ "app": {
+ "name": "IRext"
+ },
+ "page_error": {
+ "title_error": "Console Error",
+ "title_confirm_pw": "Confirm Password",
+ "auth_error": "Authentication Error",
+ "access_after_login": "Please access to console after sign in",
+ "access_to_console": "Access to console",
+ "change_pw": "Change password",
+ "register": "Register",
+ "change_pw_success": "Password has been changed, please keep it firmly : ",
+ "change_pw_fail": "Failed to change password",
+ "register_success": "User has been registered, please keep the password firmly : ",
+ "register_fail": "Failed to register user"
+ }
+}
diff --git a/console/web/error/locales/en/translation.json b/console/web/error/locales/en/translation.json
new file mode 100644
index 0000000..a8af076
--- /dev/null
+++ b/console/web/error/locales/en/translation.json
@@ -0,0 +1,18 @@
+{
+ "app": {
+ "name": "IRext"
+ },
+ "page_error": {
+ "title_error": "Console Error",
+ "title_confirm_pw": "Confirm Password",
+ "auth_error": "Authentication Error",
+ "access_after_login": "Please access to console after sign in",
+ "access_to_console": "Access to console",
+ "change_pw": "Change password",
+ "register": "Register",
+ "change_pw_success": "Password has been changed, please keep it firmly : ",
+ "change_pw_fail": "Failed to change password",
+ "register_success": "User has been registered, please keep the password firmly : ",
+ "register_fail": "Failed to register user"
+ }
+}
diff --git a/console/web/error/locales/zh-CN/translation.json b/console/web/error/locales/zh-CN/translation.json
new file mode 100644
index 0000000..b8ba6a5
--- /dev/null
+++ b/console/web/error/locales/zh-CN/translation.json
@@ -0,0 +1,18 @@
+{
+ "app": {
+ "name": "IRext"
+ },
+ "page_error": {
+ "title_error": "控制台错误",
+ "title_confirm_pw": "确认密码",
+ "auth_error": "认证错误",
+ "access_after_login": "请在登录之后访问",
+ "access_to_console": "访问控制台",
+ "change_pw": "修改密码",
+ "register": "用户注册",
+ "change_pw_success": "修改密码成功，请牢记您的新密码：",
+ "change_pw_fail": "未能成功修改密码",
+ "register_success": "注册用户成功，请牢记您的新密码：",
+ "register_fail": "未能成功注册用户"
+ }
+}
diff --git a/console/web/error/locales/zh/translation.json b/console/web/error/locales/zh/translation.json
new file mode 100644
index 0000000..b8ba6a5
--- /dev/null
+++ b/console/web/error/locales/zh/translation.json
@@ -0,0 +1,18 @@
+{
+ "app": {
+ "name": "IRext"
+ },
+ "page_error": {
+ "title_error": "控制台错误",
+ "title_confirm_pw": "确认密码",
+ "auth_error": "认证错误",
+ "access_after_login": "请在登录之后访问",
+ "access_to_console": "访问控制台",
+ "change_pw": "修改密码",
+ "register": "用户注册",
+ "change_pw_success": "修改密码成功，请牢记您的新密码：",
+ "change_pw_fail": "未能成功修改密码",
+ "register_success": "注册用户成功，请牢记您的新密码：",
+ "register_fail": "未能成功注册用户"
+ }
+}
diff --git a/console/web/js/index.js b/console/web/js/index.js
index dc676a1..a9e669a 100644
--- a/console/web/js/index.js
+++ b/console/web/js/index.js
@@ -3,12 +3,12 @@
* 2016-11-13
*/
-var LS_KEY_ID = "user_name";
-var LS_KEY_TOKEN = "token";
-var LS_KEY_LANG = "lang";
+let LS_KEY_ID = "user_name";
+let LS_KEY_TOKEN = "token";
+let LS_KEY_LANG = "lang";
-var userLang = "en-US";
-var paramLang = getParameter('lang');
+let userLang = "en-US";
+let paramLang = getParameter('lang');
if (paramLang) {
localStorage.setItem(LS_KEY_LANG, paramLang);
@@ -28,18 +28,18 @@ $("#document").ready(function() {
});
function signIn() {
- var userName = $("#user_name").val();
- var password = $("#password").val();
+ let userName = $("#user_name").val();
+ let password = $("#password").val();
if (null == userName || "" === userName || null == password || "" === password) {
toastr.error(i18n.t('page_index.d_signin_fill_email_pw', { lng: userLang }));
return;
}
- var pwHash = MD5(password);
+ let pwHash = MD5(password);
doSignIn(userName, pwHash);
}
function onChangePassword() {
- var userName = $("#user_name").val();
+ let userName = $("#user_name").val();
if (null == userName || "" === userName) {
toastr.error(i18n.t('page_index.d_signin_fill_email', { lng: userLang }));
return;
@@ -48,14 +48,14 @@ function onChangePassword() {
}
function popUpHintDialog(hint) {
- var textHint = $("#text_hint");
+ let textHint = $("#text_hint");
textHint.empty();
textHint.append(hint);
$("#hint_dialog").modal();
}
function navigateToPage(page, id, token) {
- var form = $("
"),
+ let form = $("
"),
input;
form.attr({"action" : "/irext/nav/nav_to_url"});
@@ -78,7 +78,7 @@ function navigateToPage(page, id, token) {
}
function changePassword() {
- var userName = $("#user_name").val();
+ let userName = $("#user_name").val();
if (null == userName || "" === userName) {
popUpHintDialog(i18n.t('page_index.d_signin_fill_email', { lng: userLang }));
return;
@@ -108,8 +108,8 @@ function changePassword() {
}
function doSignIn(userName, password) {
- var token = "";
- var adminID = "";
+ let token = "";
+ let adminID = "";
$.ajax({
url: "/irext/certificate/admin_login",
type: "POST",
@@ -121,9 +121,9 @@ function doSignIn(userName, password) {
token = response.entity.token;
adminID = response.entity.id;
toastr.success(i18n.t('page_index.d_signin_success', { lng: userLang }));
- var permission = token.substring(token.indexOf(",") + 1);
- var index = null;
- var page = "";
+ let permission = token.substring(token.indexOf(",") + 1);
+ let index = null;
+ let page = "";
if (null != permission && permission !== "") {
index = permission.substring(0, 1);
}
diff --git a/console/work_unit/code_manage_logic.js b/console/work_unit/code_manage_logic.js
index 2c638d2..1c47f75 100644
--- a/console/work_unit/code_manage_logic.js
+++ b/console/work_unit/code_manage_logic.js
@@ -597,16 +597,13 @@ exports.deleteRemoteIndexWorkUnit = function (remoteIndex, adminID, callback) {
if(remoteIndex.contributor.indexOf(result) == -1) {
logger.info("the admin " + result + " could not change this remote index");
callback(errorCode.FAILED);
- return;
+ } else {
+ remoteIndex.status = enums.ITEM_INVALID;
+ RemoteIndex.updateRemoteIndex(remoteIndex.id, remoteIndex,
+ function(deleteRemoteIndexErr, updatedRemoteIndex) {
+ callback(deleteRemoteIndexErr);
+ });
}
- key = "admin_" + adminID;
- adminAuth.getAuthInfo(key, function(getAdminAuthErr, result) {
- if (errorCode.SUCCESS.code == getAdminAuthErr.code && null != result) {
- callback(errorCode.SUCCESS);
- } else {
- callback(errorCode.FAILED);
- }
- });
} else {
callback(errorCode.FAILED);
}