diff --git a/install/static/ipa.js b/install/static/ipa.js index d1558ee..900ca48 100644 --- a/install/static/ipa.js +++ b/install/static/ipa.js @@ -18,10 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* IPA JSON-RPC helper */ - -var IPA_DEFAULT_JSON_URL = '/ipa/json'; - /* JSON-RPC ID counter */ var ipa_jsonrpc_id = 0; @@ -29,6 +25,8 @@ var IPA = function() { var that = {}; + /* IPA JSON-RPC helper */ + that.DEFAULT_JSON_URL = '/ipa/json'; that.json_url = null; that.use_static_files = false; @@ -192,7 +190,7 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname) var url = IPA.json_url; if (!url) - url = IPA_DEFAULT_JSON_URL; + url = IPA.DEFAULT_JSON_URL; if (IPA.use_static_files) url += '/' + method_name + '.json'; @@ -240,9 +238,9 @@ function ipa_parse_qs(qs) } /* helper function used to retrieve information about an attribute */ -function ipa_get_param_info(obj_name, attr) +function ipa_get_param_info(entity_name, attr) { - var ipa_obj = IPA.metadata[obj_name]; + var ipa_obj = IPA.metadata[entity_name]; if (!ipa_obj) return null; var takes_params = ipa_obj.takes_params; @@ -258,9 +256,9 @@ function ipa_get_param_info(obj_name, attr) } /* helper function used to retrieve attr name with members of type `member` */ -function ipa_get_member_attribute(obj_name, member) +function ipa_get_member_attribute(entity_name, member) { - var ipa_obj = IPA.metadata[obj_name]; + var ipa_obj = IPA.metadata[entity_name]; if (!ipa_obj) return null; var attribute_members = ipa_obj.attribute_members;