Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Codecrew
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
30
Merge Requests
2
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 20b09254
authored
Aug 07, 2018
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Onja would quite sure point these out on mergerequest, so made them before mergerequest :)
1 parent
a66914d8
Pipeline
#80
failed
in 0 seconds
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 additions
and
11 deletions
code/moya-angular/src/app/modules/viplist/viplist.service.ts
code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
code/moya-web/src/main/java/fi/codecrew/moya/graphql/MoyaGraphQLServlet.java
code/moya-angular/src/app/modules/viplist/viplist.service.ts
View file @
20b0925
...
...
@@ -70,7 +70,6 @@ export class ViplistService {
*/
public
get
():
Observable
<
Array
<
Vip
>>
{
return
this
.
apollo
.
watchQuery
<
VipsQueryRoot
>
({
query
:
Q_VIPS_N_DATA
}).
valueChanges
.
pipe
(
map
(
x
=>
{
console
.
log
(
x
.
data
.
vips
);
return
x
.
data
.
vips
;
}));
// return this.apollo.query<vipsQueryRoot>({query: Q_VIPS_N_DATA}).pipe(map(x => x.data.vips));
}
...
...
@@ -100,12 +99,6 @@ export class ViplistService {
public
create
(
vip
:
Vip
):
Observable
<
Vip
>
{
return
this
.
http
.
post
(
MOYA_BASE_URL
+
'v3/vip/create'
,
vip
).
pipe
(
map
(
x
=>
x
as
Vip
));
}
/*
private hostPopulator(rawVip: any): Observable<Vip> {
return this.userService.get(rawVip.hostId).pipe(
map((u: User) => {rawVip.host = u; return <Vip> rawVip; }),map(x => x as Vip),);
}*/
}
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
View file @
20b0925
...
...
@@ -626,9 +626,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_scheme_id FOREIGN KEY (scheme_id) REFERENCES compo_voting_schemes (id)"
,
"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_role_id FOREIGN KEY (role_id) REFERENCES roles (id)"
,
});
dbUpdates
.
add
(
new
String
[]{
"ALTER TABLE users DROP COLUMN postal_town;"
});
...
...
code/moya-web/src/main/java/fi/codecrew/moya/graphql/MoyaGraphQLServlet.java
View file @
20b0925
...
...
@@ -365,7 +365,6 @@ public class MoyaGraphQLServlet extends HttpServlet {
b
.
addField
(
User_
.
email
);
b
.
addField
(
User_
.
address
);
b
.
addField
(
User_
.
zip
);
//b.addField(User_.postalTown);
b
.
addField
(
User_
.
town
);
b
.
addField
(
User_
.
phone
);
b
.
addField
(
User_
.
gender
);
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment