Commit Graph

55 Commits

Author SHA1 Message Date
b949770838 pep eiiiiiight 2020-04-14 21:01:02 +01:00
e78a474290 Modify audit exclusions to properly prevent data loss 2020-04-14 20:54:41 +01:00
c291a211b0 Fix for my fix... 2020-04-13 16:57:10 +01:00
cd54ad944b Fix migrations again 2020-04-13 16:50:16 +01:00
8e62a5bfeb Merge branch 'master' into assets_audit
# Conflicts:
#	assets/models.py
# Migrations
2020-04-13 16:49:59 +01:00
0e648329f7 Use aware time in audit 2020-04-13 16:47:54 +01:00
0fe7d55eab Fix for existing invalid cable types
Also hotfix against more in the future. Proper rework needed...This is why I should have waited for review...! Lesson learnt?
2020-04-13 16:33:57 +01:00
be4a7baf8e Remove obsolete 'next_scheduled_maint' from asset model
Should fix production data...
2020-04-13 16:14:06 +01:00
c11cbaccfb Merge branch 'master' into assets_audit
# Conflicts:
#	assets/models.py
2020-04-13 15:59:08 +01:00
a0491891e9 Add 'CableTypes' (#406)
* Move relevant fields and create migration to autogen cable types

* CRUD and ordering

* FIX: Prevent creating duplicate cable types

* FIX: pep8/remove debug print

* FIX: Meta migrations... :>

* FIX: Update tests to match new UX

* Move cabletype menu links into 'Assets' dropdown

* Fix migration

* Specify version of reportlab

Should fix CI - looks like I went a bit too ham-handed in my requirements.txt purge last time...
2020-04-13 15:54:43 +01:00
afeee3b552 Remake migrations 2020-04-13 01:07:07 +01:00
39b1ff7c2f Merge branch 'master' into assets_audit 2020-04-13 01:00:01 +01:00
8568c591a9 Update Python Dependencies (#404)
* [requires.io] dependency update

* Server starts...

Various things are broken, but it runs!

* [requires.io] dependency update

* [requires.io] dependency update

* [requires.io] dependency update

* FIX: Broken migrations

* FIX: Update auth framework

* FIX: Correct static use in templates

* FIX: Fix supplier sort

* FIX: Remaining tests

* Revert "Disable password reset as temporary fix to vulnerability (#396)"

This reverts commit e0c6a56263.

# Conflicts:
#	RIGS/urls.py

* FIX: Fix broken newlining in PDFs

Introduced by a change in Django 2.1 'HTML rendered by form widgets no longer includes a closing slash on void elements, e.g. <br>. This is incompatible within XHTML, although some widgets already used aspects of HTML5 such as boolean attributes.'

* FIX: Fix some Django4 deprecation warnings

Why not...

* Refactor dependency file

Should now only include dependencies we actually use, not dependencies of dependencies and unused things

* Add newlines to the paperwork print test event

This will catch the error encountered in 79ec9214f9

* Swap to pycodestyle rather than pep8 in Travis

And eliminate W605 errors

* Bit too heavy handed with the dep purge there...

* Whoops, helps if one installs pycodestyle...

* FIX: Re-add overridden login view

* Better fix for previous commit

* FIX: Bloody smartquotes

Co-authored-by: requires.io <support@requires.io>
2020-03-07 16:21:48 +00:00
24284f9d55 FIX?: What about this way... 2020-02-27 09:55:27 +00:00
1f663c8919 FIX?: Up WebDriverWait timeout for modal tests 2020-02-27 09:30:38 +00:00
aa4977edb5 Potentially make modal tests more consistent 2020-02-25 16:44:56 +00:00
742e90fa13 Remember to test the tests Arona 2020-02-24 17:40:00 +00:00
94412da545 Improve asset audit testing 2020-02-24 17:36:04 +00:00
db7440e9da Some deduplication for testing code 2020-02-23 23:42:18 +00:00
da0c9ba87b Start tests for audit 2020-02-23 23:31:12 +00:00
e5a1830b00 FIX: Migrations 2020-02-18 16:04:03 +00:00
da48a75073 FIX: Hide asset detail buttons for basic users 2020-02-18 16:00:33 +00:00
b9434dc576 FIX: Stop quickbuttons being tab-selected
If someone's tabbing through, they won't be needing the buttons...
2020-02-17 21:27:26 +00:00
75660644eb FEAT: More handy buttons 2020-02-17 21:25:25 +00:00
6e15f12fbf FIX: Fix asset sample data command when run alone 2020-02-17 16:29:25 +00:00
68891dccd2 FEAT: Add buttons for some common defaults on audit form
TODO: Partialise those fragments and add them to the edit/create forms too.
2020-02-17 13:10:51 +00:00
759faf30f1 FIX: Gracefully handle 404s in audit search 2020-02-17 13:00:35 +00:00
0c12a3efdb Improve sample data generator
Does reversion properly and sets colours for asset statuses
2020-02-16 18:46:12 +00:00
20d9a71a9e FIX: Remove assets from to-be-audited table when audited
Previously required a page reload
2020-02-16 15:49:53 +00:00
54ec38f7e1 Various UX Improvements
Also rearranged asset detail/edit to be more space efficient
2020-02-16 15:37:09 +00:00
ed5339925e FIX: Revert partialising of asset search 2020-02-16 02:41:36 +00:00
0b2fc6d57c Added cable functionality to audit form
Also improved styling
2020-02-16 02:34:33 +00:00
1ec277978e Filter asset audit list by never-audited 2020-02-15 12:54:31 +00:00
e656b90a22 Improve audit search bar
Optimise for APM!
2020-02-15 12:54:12 +00:00
7c42ad853c WIP: Javascript shenanigans for asset audit search
It's not clean but it works..
2020-02-14 17:20:50 +00:00
e7fcaa36bb WIP: Audit modal works
Need to get the ID search working.
2020-02-14 11:47:05 +00:00
e9a9250027 WIP: Basic work on audit 2020-02-10 00:09:46 +00:00
ae151ed45e Add assets test suite (#400)
* Started POM and assets test

* FEAT: Adapt unit tests from RIGS to assets

* CHORE: pep8...

* Added Asset Create and Edit forms

* Add non-cable asset creation test

* CHORE: Frickin pep8...

* Add cable asset creation test

* Basic asset create validation testing

* Asset edit tests are here

A bit dodgy in places but par for the course for me :P

* Add access level tests

* Delete unused code

Much less effort way to increase coverage stats :D

* Add delete sample data test for completeness

Chasing that sweet 100% coverage...

* Add supplier list page + tests

Also fix the supplier page not being ordered alphabetically

* Helps if I add the migration...

* Add supplier create/edit tests

* Asset duplicate tests

Also fixed some random bugs

* Asset search tests

* 404 tests and test that everything requires authentication

* Test visibility of form errors

And fix supplier form not displaying errors correctly!

* Fix broken search test


Co-authored-by: Matthew Smith <mattysmith22@googlemail.com>
2020-02-08 13:52:07 +00:00
6ba87b0a5a CHANGE: Restructure the asset embed a bit
Should fix the forum mangling
2020-01-21 01:45:59 +00:00
630011aff7 FEAT: Add oembed for assets (#393)
* FEAT: Add oembed for assets

Don't see the worth in doing supplier currently...we don't OEmbed Org/Venue etc after all...

* FIX Copy paste error ;D

* Fix embeds not actually working for unauthenticated users

This is why I should have written tests...
2020-01-17 15:28:29 +00:00
4ad12ab40a FIX: Prevent basic users seeing individual asset version history
I prevented them from seeing the change stream, didn't prevent them seeing individual histories. This has to be done as otherwise it leaks financial information. If I can be arsed I'll come back to this and allow basic users to see a filtered version.
2020-01-11 21:13:50 +00:00
13205770f1 FIX: Correct template for AssetVersionHistory 2020-01-11 21:13:50 +00:00
6bb0c88c72 FIX: Migrations 2020-01-03 22:21:50 +00:00
82a30ca77d Miscellaneous changes to the Asset DB (#390)
* FIX #388: Prevent assets losing supplier data on edit

* FEAT: Add associated assets to supplier detail view

* FIX: Tweak supplier list to make detail view accessible

* Potential fix for #380

No idea if it works because I can't reproduce locally. S/O Reckons it should... :P

* FEAT #386: Asset search searches serial number.

Pending addition of advanced search.

* FIX: Order asset categories/statuses alphabetically

Instead of by pk because that's silly.

* FEAT: Statuses can have a CSS class defined in the admin panel

This replaces the hardcoding of colours in the asset list.

* FIX: Squash migrations

* Fixed supplier not working on all the create asset template

* Refactored away "assets" property on "Supplier" by using "related_name" instead

Co-authored-by: Matthew Smith <mattysmith22@googlemail.com>
2020-01-03 21:46:39 +00:00
01a87e0e0b FEAT: Add revision history to assets and suppliers (#387)
* FEAT: Initial work on revision history for assets

The revision history for individual items mostly works, though it shows database ID where it should show asset ID. Recent changes feed isn't yet done.

* FEAT: Initial implementation of asset activity stream

* CHORE: Fix pep8

* FIX: Asset history table 'branding'

* FIX: Individual asset version history is now correctly filtered

* FEAT: Make revision history for suppliers accessible

* CHORE: *sings* And a pep8 in a broken tree...

* Refactored out duplicated code from `AssetVersionHistory

* CHORE: pep8

And another random bit of wierd whitespace I found

Co-authored-by: Matthew Smith <mattysmith22@googlemail.com>

Closes #358
2019-12-31 12:25:42 +00:00
Matthew Smith
7c876348d7 Asset fixes (#383) 2019-12-10 22:50:28 +00:00
ddc23ce4e5 FIX: Prefix field still too limited for legacy data
Fingers crossed this works I don't have the actual data locally... I know I'm making a mess but needs must.

I genuinely hate whoever decided prefixes were a good idea now.
2019-12-06 00:58:39 +00:00
602ccc15ea FIX: Fix missing import
Presumably caused by Matt's IDE being overzealous again. I know I shouldn't be pushing to master but...one line fix...
2019-12-06 00:40:56 +00:00
Matthew Smith
b77615b9b9 Fix handling of prefixed Asset IDs and sorting of the asset list (#382)
* FIX: Remove misleading admin site title

* Moved across assets_id sorting to use proper numeric values. Also mofifies SQL command to find free asset IDs so that it works on postgres.

* Changed generateSampleAssetsData.py to include prefices on some cables.

* Fixed pep8

* Fixed missed migration

* Ensured hidden asset fields are completed on every database write

* CMULTI is a thing, and therefore a max prefix length of 5 cannot be a thing
2019-12-06 00:28:54 +00:00
62541194ee CHORE: Fix pep8
mutter mutter mutter, grumble
2019-12-05 13:10:08 +00:00