Commit 810ff5861e572a979dd3e5c4d00c503eee52c54d

Authored by Macieski
1 parent 0f2e66b7
Exists in master

corrigindo chave do campo software list

development.ini
@@ -9,7 +9,7 @@ pyramid.default_locale_name = en @@ -9,7 +9,7 @@ pyramid.default_locale_name = en
9 pyramid.includes = 9 pyramid.includes =
10 pyramid_tm 10 pyramid_tm
11 11
12 -sqlalchemy.url = postgresql://rest:rest@localhost/cacic 12 +sqlalchemy.url = postgresql://cacic:cacic@localhost/cacic
13 13
14 [server:main] 14 [server:main]
15 use = egg:waitress#main 15 use = egg:waitress#main
wscserver/model/__init__.py
@@ -5,7 +5,7 @@ from sqlalchemy.engine import create_engine @@ -5,7 +5,7 @@ from sqlalchemy.engine import create_engine
5 from pyramid import config 5 from pyramid import config
6 from paste.deploy.loadwsgi import appconfig 6 from paste.deploy.loadwsgi import appconfig
7 7
8 -sqlalchemy_url = 'postgresql://rest:rest@localhost/cacic' 8 +sqlalchemy_url = 'postgresql://cacic:cacic@localhost/cacic'
9 DBSession = scoped_session(sessionmaker()) 9 DBSession = scoped_session(sessionmaker())
10 Base = declarative_base() 10 Base = declarative_base()
11 engine = create_engine(sqlalchemy_url) 11 engine = create_engine(sqlalchemy_url)
wscserver/view/restfulview.py
@@ -65,8 +65,7 @@ class CustomRESTfulView(RESTfulView): @@ -65,8 +65,7 @@ class CustomRESTfulView(RESTfulView):
65 for soft_key, soft_value in SoftwareList.items(): 65 for soft_key, soft_value in SoftwareList.items():
66 66
67 new_SoftwareList_element = { 67 new_SoftwareList_element = {
68 - 'name': soft_key,  
69 - 'value': soft_value 68 + 'softwarelist_name': soft_value
70 } 69 }
71 new_SoftwareList.append(new_SoftwareList_element) 70 new_SoftwareList.append(new_SoftwareList_element)
72 71