master #116

Merged

mpeltriaux merged 13 commits from master into 110_Biotope_codelists

mpeltriaux commented

Owner

Update branch

mpeltriaux added 13 commits

2b66189590 #112 WIP: Restructure CompensationAction

* changes action_type from ForeignKey into M2M
* adds migration
* changes form widget
* WIP: changes rendering on detail view of compensation
* TEST NOT CHECKED YET!

afb78fa670 #112 Migration enhance

* fixes bug in migration
* adds check to migration which raises error before data loss might happen

62e452c625 WIP: CompensationAction using jstree

d04d02380f WIP: #112 Restructure CompensationAction

95856c9ee9 #112 CompensationAction Tree

* implements generic HTML based and Django compatible TreeView
* enhances listing of CompensationActions on DetailView

c0de1ae28d #112 AbstractCompensation rendering enhancements

* minor changes to detail view rendering of EMA, Compensation and EcoAccount

4be26fbc22 #112 CompensationAction explanation

* updates the help_text for action_type on NewActionModalForm to give a better explanation

6d5e2b8d15 #112 TreeWidget JS

* adds visual support on (de-)selecting checkboxes
* adds same support on initialization of checked checkboxes e.g. on edit forms

1ea5b4fc39 # 112 Search input for TreeWidget

* adds search input field for js-filtering by input

a160f3fe6c #112 Autocomplete enhancements

* enhances filtering for Autocomplete -> parent_parent will be searched for match as well
* adds rendering of parent_parent group for BiotopeAutocomplete
* enhances ordering of registration office autocomplete

ed27d8d589 #112 Order enhancement

* enhances ordering for action details and biotope details

91185ef847 #112 Tree filter case insensitive search

* adds case insensitive search for TreeWidget

b528c8ecce Merge pull request '112_Restructure_CompensationAction' (#115 ) from 112_Restructure_CompensationAction into master

Reviewed-on: SGD-Nord/konova#115

mpeltriaux merged commit aaea58217b into 110_Biotope_codelists 3 years ago

mpeltriaux referenced this issue from a commit

Merge pull request 'master' (#116) from master into 110_Biotope_codelists

The pull request has been merged as aaea58217b.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b master 110_Biotope_codelists

git pull origin master

Step 2:

Merge the changes and update on Gitea.

git checkout 110_Biotope_codelists

git merge --no-ff master

git push origin 110_Biotope_codelists

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Loading…

There is no content yet.

Labels Milestones

master #116

Step 1:

Step 2: