Skip to content

Commit

Permalink
fix: make schema compatible with dgraph v22
Browse files Browse the repository at this point in the history
  • Loading branch information
dtrckd committed Apr 10, 2023
1 parent 57451cf commit eb4aa6b
Show file tree
Hide file tree
Showing 14 changed files with 139 additions and 473 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

...

## [0.7.9]

- build: make schema compatible with dgraph v22
- buid: add options to contrib/dgraph configs file to change ports.
- refactor: update resolvers with bridge query
- refactor: make DgraphQueryResolverRaw obsolete with new Dgraph bridge resolver using proper inputs [WIP]
- fix/schema:Fix duplicate issue with artefact case; make w_* effective with *Filter input in schema.
- fix/updateAretefact: allow duplicate artefacts to be added to circles even if not at root circle.
- Update go.mod



## [0.7.8]

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ BINARY := f6
#DGRAPH_RELEASE := v21.03.1
#DGRAPH_RELEASE := v21.12.0
DGRAPH_RELEASE := v22.0.2
CLIENT_RELEASE := 0.7.8
CLIENT_RELEASE := 0.7.9
$(eval BRANCH_NAME=$(shell git rev-parse --abbrev-ref HEAD))
$(eval COMMIT_NAME=$(shell git rev-parse --short HEAD))
$(eval RELEASE_VERSION=$(shell git tag -l --sort=-creatordate | head -n 1))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Using Fractale for your organization offers the following capabilities and featu

Download and extract the given release

wget https://github.com/fractal6/fractal6.go/releases/download/0.7.8/fractal6-amd64.zip
wget https://github.com/fractal6/fractal6.go/releases/download/0.7.9/fractal6-amd64.zip
unzip fractal6-adm64.zip && mv fractal6-amd64 fractal6
cd fractal6

Expand Down
5 changes: 2 additions & 3 deletions graph/contract_op.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ func contractEventHook(uctx *model.UserCtx, cid, tid string, event *model.EventR
}
}
for _, c := range contract.PendingCandidates {
if c.Email == nil { continue }
if i := auth.IsMember("email", *c.Email, contract.Tension.Receiverid); i >= 0 {
return false, contract, fmt.Errorf("Candidate '%s' is already member.", *c.Email)
if i := auth.IsMember("email", c.Email, contract.Tension.Receiverid); i >= 0 {
return false, contract, fmt.Errorf("Candidate '%s' is already member.", c.Email)
}
}
case model.TensionEventMemberLinked:
Expand Down
59 changes: 21 additions & 38 deletions graph/generated/root_.generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit eb4aa6b

Please sign in to comment.