Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
gdd-sigma-poc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Guillaume WANG
gdd-sigma-poc
Commits
eff9386e
Commit
eff9386e
authored
6 years ago
by
Anatole ROMON
Browse files
Options
Downloads
Patches
Plain Diff
netoyage de code
parent
42251cb1
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/graphql/connectors/connectors.js
+5
-8
5 additions, 8 deletions
src/graphql/connectors/connectors.js
src/graphql/connectors/selectors.js
+1
-1
1 addition, 1 deletion
src/graphql/connectors/selectors.js
src/graphql/typeDefs/objects.js
+1
-1
1 addition, 1 deletion
src/graphql/typeDefs/objects.js
with
7 additions
and
10 deletions
src/graphql/connectors/connectors.js
+
5
−
8
View file @
eff9386e
...
...
@@ -414,7 +414,7 @@ export async function getMessage(user, messageID){
export
async
function
allVisibleEvents
(
user
){
let
selection
=
await
selectors
.
visibleEvents
(
user
);
let
result
=
await
knex
.
select
().
from
(
'
events
'
).
whereIn
(
'
id
'
,
selection
);
for
(
r
of
result
){
for
(
let
r
of
result
){
r
.
type
=
'
Announcement
'
;
}
return
result
;
...
...
@@ -426,7 +426,7 @@ export async function allVisibleAnnouncements(user){
result
=
result
.
concat
(
await
knex
.
select
().
from
(
'
events
'
).
whereIn
(
'
id
'
,
selection
)
);
for
(
r
of
result
){
for
(
let
r
of
result
){
r
.
type
=
'
Announcement
'
;
}
return
result
;
...
...
@@ -435,8 +435,7 @@ export async function allVisibleAnnouncements(user){
export
async
function
receivedPrivatePosts
(
user
,
groupUID
){
let
received_messages
=
await
selectors
.
recievedMessages
(
user
,
groupUID
);
let
result
=
await
knex
(
'
private_posts
'
).
select
().
whereIn
(
'
id
'
,
received_messages
);
let
entry
;
for
(
entry
of
result
){
for
(
let
entry
of
result
){
entry
.
type
=
"
PrivatePost
"
;
}
return
result
;
...
...
@@ -445,8 +444,7 @@ export async function receivedPrivatePosts(user, groupUID){
export
async
function
receivedQuestions
(
user
,
groupUID
){
let
received_messages
=
await
selectors
.
recievedMessages
(
user
,
groupUID
);
let
result
=
await
knex
(
'
questions
'
).
select
().
whereIn
(
'
id
'
,
received_messages
);
let
entry
;
for
(
entry
of
result
){
for
(
let
entry
of
result
){
entry
.
type
=
"
Question
"
;
}
return
result
;
...
...
@@ -455,8 +453,7 @@ export async function receivedQuestions(user, groupUID){
export
async
function
receivedAnswers
(
user
,
groupUID
){
let
received_messages
=
await
selectors
.
recievedMessages
(
user
,
groupUID
);
let
result
=
await
knex
(
'
answers
'
).
select
().
whereIn
(
'
id
'
,
received_messages
);
let
entry
;
for
(
entry
of
result
){
for
(
let
entry
of
result
){
entry
.
type
=
"
Answer
"
;
}
return
result
;
...
...
This diff is collapsed.
Click to expand it.
src/graphql/connectors/selectors.js
+
1
−
1
View file @
eff9386e
...
...
@@ -120,7 +120,7 @@ export async function metaGroupAdminMembers(user, metaGroupUID){
export
async
function
recievedMessages
(
user
,
groupUID
){
return
function
(
qb
){
return
qb
.
column
({
id
:
'
message
'
}).
select
().
from
(
'
group_message_relationships
'
).
where
(
'
group
'
,
groupUID
).
where
(
'
status
'
,
'
receive
'
);
}
}
;
}
...
...
This diff is collapsed.
Click to expand it.
src/graphql/typeDefs/objects.js
+
1
−
1
View file @
eff9386e
...
...
@@ -186,7 +186,7 @@ const Message = `
recipients: Group
# Une annonce éventuellement concernée par cette question.
#
Null si la question ne concerne pas une annonce particulière
#
Null si la question ne concerne pas une annonce particulière
forAnnouncement : Announcement
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment