diff --git a/wscacicneo/model/orgao.py b/wscacicneo/model/orgao.py index 4da6152..28e3253 100644 --- a/wscacicneo/model/orgao.py +++ b/wscacicneo/model/orgao.py @@ -95,17 +95,9 @@ class OrgaoBase(WSCacicNeo): required=True )) - base_metadata = BaseMetadata(**dict( + base_metadata = BaseMetadata( name='orgaos', - description='Órgãos da administração pública', - password='123456', - idx_exp=False, - idx_exp_url='index_url', - idx_exp_time=300, - file_ext=True, - file_ext_time=300, - color='#FFFFFF' - )) + ) content_list = Content() content_list.append(nome) @@ -153,12 +145,12 @@ class OrgaoBase(WSCacicNeo): else: raise IOError('Error excluding base from LB') -orgao = OrgaoBase().metaclass +OrgaoMetaClass = OrgaoBase().metaclass -class Orgao(orgao): +class Orgao(OrgaoMetaClass): """ Classe genérica de órgãos """ def __init__(self, **args): - super(Orgao, self).__init__(**args) \ No newline at end of file + super(Orgao, self).__init__(**args) diff --git a/wscacicneo/static/js/orgao.js b/wscacicneo/static/js/orgao.js index ddaedc9..7f3e9dc 100644 --- a/wscacicneo/static/js/orgao.js +++ b/wscacicneo/static/js/orgao.js @@ -97,7 +97,7 @@ Ext.onReady(function(){ $('#button-1017-btnIconEl').click(function(){ var nome = $('#textfield-1010-inputEl').val() sigla = $('#textfield-1011-inputEl').val() - gestor = $('#textfield-1012-inputEl').val() + cargo = $('#textfield-1012-inputEl').val() telefone = $('#textfield-1013-inputEl').val() email = $('#textfield-1014-inputEl').val() end = $('#textfield-1015-inputEl').val() @@ -105,7 +105,7 @@ $('#button-1017-btnIconEl').click(function(){ var reg = { 'nome' : nome, 'sigla': sigla, - 'gestor': gestor, + 'gestor': cargo, 'telefone': telefone, 'email': email, 'end': end, diff --git a/wscacicneo/templates/master.pt b/wscacicneo/templates/master.pt index 42c0d4d..18bb48d 100644 --- a/wscacicneo/templates/master.pt +++ b/wscacicneo/templates/master.pt @@ -53,11 +53,11 @@ - + - + diff --git a/wscacicneo/templates/orgao.pt b/wscacicneo/templates/orgao.pt index 9fc935e..7ce2554 100644 --- a/wscacicneo/templates/orgao.pt +++ b/wscacicneo/templates/orgao.pt @@ -1,6 +1,6 @@ - +
diff --git a/wscacicneo/views.py b/wscacicneo/views.py index 4ab821c..2dff30e 100644 --- a/wscacicneo/views.py +++ b/wscacicneo/views.py @@ -203,7 +203,7 @@ def post_orgao(request): """ Post doc órgãos """ - rest_url = 'http://api.brlight.net/api' + rest_url = REST_URL orgaobase = OrgaoBase().lbbase doc = request.params orgao_obj = Orgao( -- libgit2 0.21.2