master #205

Merged

mpeltriaux merged 31 commits from master into Docker

mpeltriaux commented

Owner

Update Docker

mpeltriaux added 31 commits

1367fd2b5f Compensation forms refactoring

* splits compensation/forms.py and /modalForms.py into individual files inside new packages
    * general forms stay in new files in compensation/forms
    * modal forms stay in new files in compensation/forms/modals

de8d79983d Intervention forms

* refactors intervention/forms and ../modalForms into individual files in separated packages
    * forms.py has been renamed into intervention.py, now can be found as intervention/forms/intervention.py
    * modalForms.py has been split into individual files living in modals package, can be found as intervention/forms/modals/...

05c1bf677c User forms

* refactors user/forms.py by splitting into modals package and regular forms
    * regular forms can now be found at user/forms/user.py and user/forms/team.py
    * modal forms can now be found at user/forms/modals/...

ca6770ec54 Tables refactoring

* splits compensation tables.py into individual files for compensation table and eco account table

c07933a9bf Konova filter mixins

* refactors konova/mixins.py into individual files in konova/mixins/...

87b1da8fdd Autocomplete refactoring

* refactors konova/autocompletes.py by splitting into individual files and moving them to fitting apps
     * autocomplete files now live in APPNAME/autocomplete/...

75777d65c6 Filters refactoring

* splits filters.py of compensation and ema app into separate files in new /filters module
* optimizes entry search for multi keyword input

55a69d45c3 Intervention views

* splits intervention/views.py (+700 lines) into separate files in new module
    * view files can now be found in /intervention/views/...

79840550cb EMA views

* splits ema/views.py (+700 lines) into separate files in new module
    * view files can now be found in /ema/views/...

8c3e8b596a Compensation views

* splits compensation/views/compensation.py (+700 lines) into separate files in new module
    * view files can now be found in /compensation/views/compensation/...

d168ec47ce EcoAccount views

* splits compensation/views/eco_account.py (+700 lines) into separate files in new module
    * view files can now be found in /compensation/views/eco_account/...

3c416fa264 Konova views

* splits konova/views.py into separate files in new module
    * view files can now be found in /konova/views/...
* introduces first class based view AbstractLogView
    * implemented for Ema, Intervention, Compensation and EcoAccount

ef3507f058 Resubmission class view

* adds AbstractResubmissionView to konova app
    * implemented for all major data types
    * replaces function based views

7b35591f5d Record class view

* adds AbstractRecordView to konova/views/record.py
    * implements for all major data types

a73046aa02 Document views

* replaces function based views for creating, editing, removing and fetching documents with class based views
    * implemented for all major data types

9e6a9f4902 Deadline views

* replaces function based views for deadlines with class based views

59b77fe567 Ema Deadline views

* replaces ema deadline views with class based

75802c5f66 State views

* replaces function based state views with class based

e66c5369a7 CompensationAction views

* replaces function based action views with class based

09402611dc EcoAccount views

* splits compensation/views/eco_account.py (+700 lines) into separate files in new module
    * view files can now be found in /compensation/views/eco_account/...

fc19a4de52 Share views

* replaces function based share views with class based
* improves team-share autocomplete search
* renames internal share url names

07fb021049 Merge pull request '104_Class_based_views' (#200 ) from 104_Class_based_views into master

Reviewed-on: SGD-Nord/konova#200

f49bb74c38 Login required on modals

* adds new login_required_modal decorator
    * can be used before regular login_required decorator to return a proper session-timed-out message

8f5a90dede Merge pull request 'Login required on modals' (#201 ) from modal_login_required into master

Reviewed-on: SGD-Nord/konova#201

a8b7cebc09 Netgis client update

* adds new version to sources

61cd1a697b NEtgis Client Bugfix

* fixes bug where initial geometry has not been rendered on client loading
* needs to be replaced asap by a proper bugfix from the original devs

c91caa72d6 Bugfix Webfonts Netgis Client

60001089f4 Webfonts

4b20802a6a Merge pull request 'map_client_update' (#203 ) from map_client_update into master

Reviewed-on: SGD-Nord/konova#203

2957a6aa60 202 Geometry conflict checking to background

* wraps check_for_conflicts() in celery based method
* fixes bug on InterventionEditForm where geometry's save() has been called twice

63ff4b372b Merge pull request '202 Geometry conflict checking to background' (#204 ) from 202_Geometry_conflict_checking_to_background into master

Reviewed-on: SGD-Nord/konova#204

mpeltriaux merged commit bb3a538b57 into Docker 2 years ago

mpeltriaux referenced this issue from a commit

Merge pull request 'master' (#205) from master into Docker

The pull request has been merged as bb3a538b57.

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 Docker

git pull origin master

Step 2:

Merge the changes and update on Gitea.

git checkout Docker

git merge --no-ff master

git push origin Docker

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 #205

Step 1:

Step 2: