Merge branch '54-ibbl-technician-view' into 'master' (878864d8) · Commits · SMASCH / scheduling-system · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

scheduling-system
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- External wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

878864d8

Commit 878864d8 authored 8 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch '54-ibbl-technician-view' into 'master'

Resolve "IBBL technician view"

Closes #54

See merge request !6

parents ed8a3d69 834bf7ed

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

smash/web/forms.py 12 additions, 1 deletion

smash/web/forms.py
smash/web/models.py 6 additions, 0 deletions

smash/web/models.py
smash/web/templates/equipment_and_rooms/index.html 14 additions, 3 deletions

smash/web/templates/equipment_and_rooms/index.html
smash/web/templates/equipment_and_rooms/kit_requests.html 103 additions, 0 deletions

smash/web/templates/equipment_and_rooms/kit_requests.html
smash/web/templates/equipment_and_rooms/kit_requests_send_mail.html 26 additions, 0 deletions

...templates/equipment_and_rooms/kit_requests_send_mail.html
smash/web/tests/functions.py 6 additions, 2 deletions

smash/web/tests/functions.py
smash/web/tests/test_view_kit_request.py 76 additions, 0 deletions

smash/web/tests/test_view_kit_request.py
smash/web/urls.py 4 additions, 0 deletions

smash/web/urls.py
smash/web/views.py 57 additions, 1 deletion

smash/web/views.py

with 304 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment