Skip to content

Test branch #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m123shkum wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Test branch #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bccdd7f
test
20Manish20 Oct 7, 2021
d3ce4d5
key added in deliverable target project
20Manish20 Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ ssl
nbproject
public/uploads/*
!public/uploads/.gitkeep

package-lock.json
yarn.lock
############################
# Node.js
############################
Expand Down
7 changes: 5 additions & 2 deletions api/deliverable-target-project/models/deliverable-target-project.settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"model": "deliverable-units-org"
},
"project_with_deliverable_targets": {
"via": "deliverable_target_project",
"collection": "project-with-deliverable-target"
"collection": "project-with-deliverable-target",
"via": "deliverable_target_project"
},
"type": {
"type": "enumeration",
Expand Down Expand Up @@ -68,6 +68,9 @@
},
"value_qualitative_option": {
"type": "json"
},
"parent_id": {
"type": "integer"
}
}
}
4 changes: 2 additions & 2 deletions api/project-with-deliverable-target/models/project-with-deliverable-target.settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
},
"attributes": {
"deliverable_target_project": {
"model": "deliverable-target-project",
"via": "project_with_deliverable_targets"
"via": "project_with_deliverable_targets",
"model": "deliverable-target-project"
},
"project": {
"model": "project"
Expand Down
Loading