aleksis/AlekSIS-App-Hjelp
Watch
10
0
Fork
You've already forked AlekSIS-App-Hjelp
 0
Code Issues 3 Pull requests Projects Releases 1 Packages 1 Activity Actions

Resolve "Rewrite REBUS with django-select2" #64

Merged
hansegucker merged 33 commits from 6-rewrite-rebus-with-django-select2 into master 2020-04-16 15:00:00 +02:00
Conversation 37 Commits 33 Files changed 11 +425 -776
yuha commented 2020-04-13 21:29:11 +02:00
Member
Copy link

Closes #6

Closes #6
yuha commented 2020-04-13 21:29:12 +02:00
Author
Member
Copy link

changed milestone to %"2.0a2"

changed milestone to %"2.0a2"
hansegucker commented 2020-04-13 21:37:48 +02:00
Owner
Copy link

Please add the the common usable Select2 code to the core for using it with other parts of AlekSIS, too, and refer from there in this app.

Please add the the common usable Select2 code to the core for using it with other parts of AlekSIS, too, and refer from there in this app.
hansegucker commented 2020-04-13 21:40:22 +02:00
Owner
Copy link

Where this function is used? And if it's used, please replace it by using the messages framework.

Where this function is used? And if it's used, please replace it by using the messages framework.
yuha commented 2020-04-13 21:43:45 +02:00
Author
Member
Copy link

Actually it is not used. Anyway, it is not written by me so that I will delete it now.

Actually it is not used. Anyway, it is not written by me so that I will delete it now.
yuha commented 2020-04-13 21:46:05 +02:00
Author
Member
Copy link

changed this line in version 2 of the diff

changed this line in [version 2 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1698&start_sha=b7ec9072f9f356ba63edc0dabf34c1eb2cd8fca4#1d5c742651b598a03a3894a8537d40c474fb340c_18_18)
yuha commented 2020-04-13 21:46:06 +02:00
Author
Member
Copy link

added 1 commit

  • a79a96cc - remove unnecessary function create_info in views.py

Compare with previous version

added 1 commit <ul><li>a79a96cc - remove unnecessary function create_info in views.py</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1698&start_sha=b7ec9072f9f356ba63edc0dabf34c1eb2cd8fca4)
yuha commented 2020-04-13 21:53:35 +02:00
Author
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>e4269cdd - remove datetime import</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1700&start_sha=a79a96cce5378e34295cf88fdd5d9f89fbd1150d)
yuha commented 2020-04-13 21:54:48 +02:00
Author
Member
Copy link

resolved all threads

resolved all threads
yuha commented 2020-04-13 21:55:56 +02:00
Author
Member
Copy link

@hansegucker What do you mean by adding the common usable Select2 code to the core?

@hansegucker What do you mean by adding the common usable Select2 code to the core?
hansegucker commented 2020-04-13 21:57:31 +02:00
Owner
Copy link

Mainly CSS/JS files, but I don't know if there is other reusable stuff.

Mainly CSS/JS files, but I don't know if there is other reusable stuff.
yuha commented 2020-04-13 21:59:29 +02:00
Author
Member
Copy link

I guess I will deal with that tomorrow.

I guess I will deal with that tomorrow.
hansegucker commented 2020-04-13 22:06:14 +02:00
Owner
Copy link

Another thing: Please mark models as extensible by using ExtensibleModel.

Another thing: Please mark models as extensible by using `ExtensibleModel`.
yuha commented 2020-04-14 12:44:32 +02:00
Author
Member
Copy link

added 1 commit

  • 24c77191 - Marked all models as ExtensibleModel

Compare with previous version

added 1 commit <ul><li>24c77191 - Marked all models as ExtensibleModel</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1705&start_sha=e4269cdd45fd5e77167b17501cb6a242dc0eb8bc)
yuha commented 2020-04-14 12:48:08 +02:00
Author
Member
Copy link

So the only CSS/JS files that are not already included in the core are two files that are used to materialize select2 and which are currently in the static folder of hjelp. How do I move them to the core?

So the only CSS/JS files that are not already included in the core are two files that are used to materialize select2 and which are currently in the static folder of hjelp. How do I move them to the core?
hansegucker commented 2020-04-14 12:49:30 +02:00
Owner
Copy link

Create a new MR in core which adds the files to core static folder, wait until it's merged, then remove the files from this branch and refer the files from the core in the static tag.

Create a new MR in core which adds the files to core static folder, wait until it's merged, then remove the files from this branch and refer the files from the core in the static tag.
yuha commented 2020-04-14 15:12:32 +02:00
Author
Member
Copy link

added 2 commits

  • 9d6aa1d7 - Remove materialize-select2.js reference since it is not really needed in order...
  • a1bbebc3 - Drop select2-materialize.css since it is now referred to in the core.

Compare with previous version

added 2 commits <ul><li>9d6aa1d7 - Remove materialize-select2.js reference since it is not really needed in order...</li><li>a1bbebc3 - Drop select2-materialize.css since it is now referred to in the core.</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1713&start_sha=24c771912b985ef4608dcfd98884992813c40b81)
yuha commented 2020-04-14 15:33:58 +02:00
Author
Member
Copy link

added 1 commit

  • b4c1c79c - Add extended_data field to match ExtensibleModel

Compare with previous version

added 1 commit <ul><li>b4c1c79c - Add extended_data field to match ExtensibleModel</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1714&start_sha=a1bbebc3e9a8a091b038fb3bcae6b1deddb8a42b)
yuha commented 2020-04-14 16:02:03 +02:00
Author
Member
Copy link

added 1 commit

  • b1b5cc4f - Set equal max-height and margins for all bug category fields

Compare with previous version

added 1 commit <ul><li>b1b5cc4f - Set equal max-height and margins for all bug category fields</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1716&start_sha=b4c1c79c55faa503240ac4a38de8105b961bf8ec)
yuha commented 2020-04-14 20:34:47 +02:00
Author
Member
Copy link

added 1 commit

  • fd63ae74 - load any_js in REBUS template and include select2-materialize JS/CSS via any_js

Compare with previous version

added 1 commit <ul><li>fd63ae74 - load any_js in REBUS template and include select2-materialize JS/CSS via any_js</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1728&start_sha=b1b5cc4f96cb27b0dad1a37400a817c53107ee77)
yuha commented 2020-04-14 20:40:52 +02:00
Author
Member
Copy link

added 1 commit

  • c47a9646 - Style bug category fields according to other input fields with regard to top/bottom margins

Compare with previous version

added 1 commit <ul><li>c47a9646 - Style bug category fields according to other input fields with regard to top/bottom margins</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1729&start_sha=fd63ae742c2695d429c6906630f12203ca2feb58)
yuha commented 2020-04-15 13:40:23 +02:00
Author
Member
Copy link

resolved all threads

resolved all threads
yuha commented 2020-04-15 13:40:34 +02:00
Author
Member
Copy link

Can be merged now.

Can be merged now.
hansegucker commented 2020-04-15 13:45:09 +02:00
Owner
Copy link
    {% include_js "select2-materialize" %}
```suggestion:-0+0 {% include_js "select2-materialize" %} ```
yuha commented 2020-04-15 13:46:20 +02:00
Author
Member
Copy link

resolved all threads

resolved all threads
yuha commented 2020-04-15 13:46:30 +02:00
Author
Member
Copy link

changed this line in version 10 of the diff

changed this line in [version 10 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1748&start_sha=c47a96468f258db956f01ffbb165897680729d41#03ed909ed08a94b0c9497507ad779e004bb91584_83_83)
yuha commented 2020-04-15 13:46:33 +02:00
Author
Member
Copy link

added 1 commit

  • b3e56ec0 - Apply suggestion to aleksis/apps/hjelp/templates/hjelp/rebus.html

Compare with previous version

added 1 commit <ul><li>b3e56ec0 - Apply suggestion to aleksis/apps/hjelp/templates/hjelp/rebus.html</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1748&start_sha=c47a96468f258db956f01ffbb165897680729d41)
yuha commented 2020-04-15 13:46:46 +02:00
Author
Member
Copy link

Why am I mixing up JS and CSS so often recently?

Why am I mixing up JS and CSS so often recently?
yuha commented 2020-04-15 13:46:53 +02:00
Author
Member
Copy link

resolved all threads

resolved all threads
nik commented 2020-04-15 22:00:47 +02:00
Owner
Copy link

Please adhere to the order of imports.

Please adhere to the order of imports.
nik commented 2020-04-15 22:12:17 +02:00
Owner
Copy link

Please namespace your static files in subdirectories with the app's name.

Please namespace your static files in subdirectories with the app's name.
yuha commented 2020-04-16 14:16:17 +02:00
Author
Member
Copy link

added 2 commits

  • e058b49f - Move CSS in subdirectory with apps name in order to fit the rest of the project
  • a2a11989 - Merge remote-tracking branch 'origin/6-rewrite-rebus-with-django-select2' into...

Compare with previous version

added 2 commits <ul><li>e058b49f - Move CSS in subdirectory with apps name in order to fit the rest of the project</li><li>a2a11989 - Merge remote-tracking branch &#39;origin/6-rewrite-rebus-with-django-select2&#39; into...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1754&start_sha=b3e56ec02d74e4ae2a90bd34d5006abf5352f370)
yuha commented 2020-04-16 14:22:12 +02:00
Author
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>26ca87f6 - Adhere to order of imports</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/8/diffs?diff_id=1755&start_sha=a2a11989733f894557d1b2308327a13b1e9188b4)
yuha commented 2020-04-16 14:22:22 +02:00
Author
Member
Copy link

resolved all threads

resolved all threads
yuha commented 2020-04-16 14:22:46 +02:00
Author
Member
Copy link

@nik Please review again. Have I missed something?

@nik Please review again. Have I missed something?
nik commented 2020-04-16 14:34:59 +02:00
Owner
Copy link

Yes, exactly half of what you were supposed to do ;).

You namespaced the CSS file, but not the JS.

Yes, exactly half of what you were supposed to do ;). You namespaced the CSS file, but not the JS.
nik commented 2020-04-16 14:59:59 +02:00
Owner
Copy link

mentioned in commit 766c2fc323

mentioned in commit 766c2fc3239f4ebb4590e6974b3cbcbc31e49505
nik commented 2020-04-16 15:00:00 +02:00
Owner
Copy link

merged

merged
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
board
done

  
board
ready

  
board
todo

  
check
delete-eslint-rc-js

  
check
update-builddeps-package-json

  
check
update-eslint-rc-js

  
check
update-gitignore

  
check
update-merge-request-template

  
check
update-prettier-ignore

  
check
update-pyproject-toml

  
check
update-renovate-json

  
check
update-tox-ini

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
breaking

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

  
source::aleksolotl
No labels
Security
TeX
auto-update
board
done
board
ready
board
todo
check
delete-eslint-rc-js
check
update-builddeps-package-json
check
update-eslint-rc-js
check
update-gitignore
check
update-merge-request-template
check
update-prettier-ignore
check
update-pyproject-toml
check
update-renovate-json
check
update-tox-ini
part
backend
part
ci
part
docs
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
breaking
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
source::aleksolotl
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 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

Reference
aleksis/AlekSIS-App-Hjelp!64
No description provided.