|
|
|
@ -22,7 +22,7 @@ import urllib2
|
|
|
|
|
|
|
|
|
|
from calculate.core.server.methods_func import get_method_argparser, \
|
|
|
|
|
collect_object, RawAndDefaultsHelpFormatter, \
|
|
|
|
|
check_result_msg, get_param_pwd
|
|
|
|
|
check_result_msg, get_param_pwd, getErrorOnParam
|
|
|
|
|
|
|
|
|
|
def parse():
|
|
|
|
|
parser = argparse.ArgumentParser(add_help=False,
|
|
|
|
@ -104,7 +104,7 @@ def get_view(client, method, sid, view_params):
|
|
|
|
|
raise Exception(1)
|
|
|
|
|
return view
|
|
|
|
|
|
|
|
|
|
def call_method(client, args, wait_thread):
|
|
|
|
|
def call_method(client, args, unknown_args, wait_thread):
|
|
|
|
|
method = args.method
|
|
|
|
|
no_questions = args.no_questions
|
|
|
|
|
stdin_passwd = args.stdin_passwd
|
|
|
|
@ -115,7 +115,7 @@ def call_method(client, args, wait_thread):
|
|
|
|
|
method_parser = get_method_argparser(view, args)
|
|
|
|
|
param_object = _create_obj(client, method)
|
|
|
|
|
try:
|
|
|
|
|
args, unknown_args = method_parser.parse_known_args()
|
|
|
|
|
args, unknown_args = method_parser.parse_known_args(unknown_args)
|
|
|
|
|
except SystemExit:
|
|
|
|
|
raise Exception(1)
|
|
|
|
|
for i in unknown_args:
|
|
|
|
@ -182,10 +182,7 @@ def call_method(client, args, wait_thread):
|
|
|
|
|
for Group in view.groups.GroupField:
|
|
|
|
|
for field in Group.fields.Field:
|
|
|
|
|
if field.name == error.field:
|
|
|
|
|
if field.opt.shortopt or field.opt.longopt:
|
|
|
|
|
params_text += _('Wrong option ')
|
|
|
|
|
params_text += ', '.join(filter(None,
|
|
|
|
|
[field.opt.shortopt, field.opt.longopt]))+'. '
|
|
|
|
|
params_text += getErrorOnParam(args,field)
|
|
|
|
|
red = '\033[31m * \033[0m'
|
|
|
|
|
_print ('\r' + red + params_text + error.message)
|
|
|
|
|
return None
|
|
|
|
|