Commit Graph

1675 Commits

Author SHA1 Message Date
5bfa737f6b First pass at filters
They're currently exclusive with each other and search, which ain't quite right!

Also stopped search from searching comments.
2019-10-02 22:49:54 +01:00
Matthew Smith
8599a2ae5b Improved handling of asset ID when searching 2019-10-02 21:54:39 +01:00
Matthew Smith
63eb0fc3ce Merge branch 'assets' of https://github.com/nottinghamtec/PyRIGS into assets 2019-10-02 21:14:03 +01:00
Matthew Smith
207bf7bd7a Added dependency django-polymorphic
Model change to take advantage of said polymorphism
Implemented asset search
2019-10-02 21:12:24 +01:00
e591ebe05a Show purchase and collection details side by side
Not sure if I like this or not. Maybe collection should start collapsed, too.
2019-10-02 19:38:05 +01:00
3d7fc18fb7 Fix unclosed tags in asset_update 2019-10-02 18:58:52 +01:00
6c68343653 Add status colors to asset list 2019-10-02 18:34:34 +01:00
5cb668fd7a Fix delete confirmation modal styling 2019-10-02 17:40:21 +01:00
Matthew Smith
7aba164a46 Added .pytest_cache to gitignore 2019-10-02 17:32:57 +01:00
42a63f035c Asset detail view button improvements 2019-10-02 17:17:35 +01:00
15113c4fbc Fix asset list quicklinks 2019-10-02 16:51:45 +01:00
721599d35e Delete Materialize 2019-10-02 12:49:43 +01:00
warlordjones
9bcff7cd5f Supplier bootstrap port 2019-10-02 12:40:55 +01:00
warlordjones
f3c7f89f31 Initial bootstrap port of asset_update 2019-10-02 12:08:52 +01:00
Matthew Smith
8c60f6cb1d created separate base for RIGS and assets.
Fixed create asset form
2019-10-01 22:46:48 +01:00
warlordjones
a9a05b06fa Begin bootstrap port 2019-10-01 19:59:02 +01:00
warlordjones
d89d449ab1 Fix sample data generator 2019-10-01 19:22:15 +01:00
warlordjones
36ac122f7a Add requirements from assets
Only added new requirements rather than version matching dependencies RIGS already required
2019-10-01 18:45:59 +01:00
Matthew Smith
6cff7c090c Modified configs so that templates are rendered. Functionality and styling are NOT complete (need to change css framework) 2019-10-01 18:10:34 +01:00
Matthew Smith
1df971bbba Updated RIGS configs to allow for extra assets info 2019-10-01 13:29:52 +01:00
Matthew Smith
39e3898c7d Merge branch 'master' of PyAssets into assets 2019-10-01 13:24:47 +01:00
Matthew Smith
1e1f3037f8 Preparing files for transfer to PyRIGS 2019-10-01 13:22:16 +01:00
David Taylor
1a49bb50e5 Further version history improvements 2019-07-28 23:40:35 +01:00
David Taylor
86b349f60e Tidy up version history for risk assessments 2019-07-28 23:32:54 +01:00
David Taylor
35997aa882 Add API hook for logging risk assessment completion (#341) 2019-07-28 23:08:18 +01:00
David Taylor
faa4573f6d Add dash to date range 2019-07-14 23:15:13 +01:00
David Taylor
7babaee44c Add link to pre-filled risk assessment form 2019-07-14 23:09:44 +01:00
David Taylor
c0fe176495 Add docker dev instructions 2019-07-14 23:04:12 +01:00
David Taylor
b269069b6a Improve embedding style 2019-06-20 00:56:11 +01:00
David Taylor
7e06b5a162 Increase height of forum embeds 2019-06-20 00:29:10 +01:00
David Taylor
a18bb07d78 Update views.py 2019-06-20 00:15:16 +01:00
David Taylor
bd28d2054e Remove autofocus from form 2019-06-20 00:13:24 +01:00
David Taylor
14836f135c Update subhire form location
Requested by Jonny
2019-02-25 21:29:14 +00:00
Harry Bridge
5aafa36d2a Tidy up logic for which links to show, made comments duplicate 2019-01-31 20:03:49 +00:00
Harry Bridge
1ef60943ea Put duplication into one view 2019-01-31 20:03:08 +00:00
Johnathan Graydon
9480f697ff Merge branch 'master' into duplicate_asset 2019-01-13 16:49:03 +00:00
Johnathan Graydon
7478068a14 Fix defaults, will close #3
Moved to template now model as it both fixed the bug and consolidated edit points
2019-01-13 16:30:45 +00:00
Johnathan Graydon
c0a7e962b7 Add asset duplication 2019-01-13 15:28:37 +00:00
Johnathan Graydon
2717133d1c Style adjustments 2019-01-12 16:25:59 +00:00
Johnathan Graydon
c03902d76b Add minor customisation to backend 2019-01-12 15:46:48 +00:00
Johnathan Graydon
932739b505 Add default for acquired and status to base model
Will close #3
2019-01-12 15:27:28 +00:00
Harry Bridge
5e15622cdf Migration for some changes that happened in the past 2019-01-11 22:52:35 +00:00
Harry Bridge
393d3a1f49 Made asset list title less massive 2019-01-08 00:23:29 +00:00
Harry Bridge
905eea7792 Updated sample data creation 2019-01-08 00:22:46 +00:00
Harry Bridge
f24a510a8e Added crud for suppliers 2019-01-08 00:21:58 +00:00
Harry Bridge
51aec6f597 Added basic api 2019-01-05 22:52:39 +00:00
Harry Bridge
d8440ad9e5 Updated admin and settings 2019-01-05 20:05:41 +00:00
Harry Bridge
ef8ddf3642 Removed old template 2019-01-05 20:05:14 +00:00
Harry Bridge
779fc42f26 Added views 2019-01-05 20:04:58 +00:00
Harry Bridge
e8fcfd3a50 Sass updates 2019-01-05 20:01:19 +00:00