diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp index b642b991eb5..f589764aaab 100644 --- a/ui/jsp/account.jsp +++ b/ui/jsp/account.jsp @@ -200,4 +200,37 @@

<%=t.t("please.confirm.you.want.to.enable.account")%>

- \ No newline at end of file + + + + + \ No newline at end of file diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js index 7c46cf50a69..c60db02456d 100644 --- a/ui/scripts/cloud.core.account.js +++ b/ui/scripts/cloud.core.account.js @@ -19,8 +19,27 @@ var systemAccountId = 1; var adminAccountId = 2; -function accountGetSearchParams() { - return ""; +function accountGetSearchParams() { + var moreCriteria = []; + + var $advancedSearchPopup = $("#advanced_search_popup"); + if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) { + var name = $advancedSearchPopup.find("#adv_search_name").val(); + if (name != null && name.length > 0) + moreCriteria.push("&name="+todb(name)); + + var role = $advancedSearchPopup.find("#adv_search_role").val(); + if (role != null && role.length > 0) + moreCriteria.push("&accounttype="+role); + } + else { + var searchInput = $("#basic_search").find("#search_input").val(); + if (lastSearchType == "basic_search" && searchInput != null && searchInput.length > 0) { + moreCriteria.push("&name="+todb(searchInput)); + } + } + + return moreCriteria.join(""); } function afterLoadAccountJSP() {