Commit Graph

342 Commits

Author SHA1 Message Date
snipe a0fce2e0fb Fixes #766
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
snipe 6a7fcd5c40 Fixes #769 - set sort order for Accessory Category 2015-04-29 13:54:54 -07:00
Fei Song 1c2e5ecc0f Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error 2015-04-28 15:19:00 +08:00
snipe e88a81141f Added view link to asset tag, since some assets won't have names 2015-04-02 15:40:41 -07:00
snipe 33e7ce6761 Fixes for #722 localization 2015-04-02 14:28:11 -07:00
snipe 0a734d8502 Missing semicolons 2015-04-01 15:44:13 -07:00
madd15 46781c94cd Fix #715 - Missing $modelCheck api call 2015-04-02 09:10:07 +10:30
snipe afdf00eacb Removed settings save for display fields 2015-03-27 22:34:39 -07:00
snipe 5d946b19cb Fixed checkmodel at route level 2015-03-27 17:44:49 -07:00
snipe 605d0ed8e1 Moved checkModel into model from controller 2015-03-27 13:45:37 -07:00
snipe bbcc8aa9ac Update groups if unlocked 2015-03-25 14:26:12 -07:00
snipe 865c302f71 Prevent changing user email/pass/groups if locked 2015-03-25 14:26:00 -07:00
snipe 8685e90513 Merge pull request #689 from madd15/feat/more-tables
Convert to Datatables - Models, Categories and Accessories
2015-03-24 18:45:34 -07:00
madd15 a9f15fbcae Convert Categories View to use Datatables, and fix Model View missing comma 2015-03-25 12:03:49 +10:30
madd15 7d266fdc4e Convert Models View to use Datatables 2015-03-25 12:03:48 +10:30
madd15 7f03c7538f Convert Accessories View to use Datatable 2015-03-25 12:03:47 +10:30
madd15 7881e70afb Update Model Check in Hardware Edit and move to API 2015-03-25 12:03:45 +10:30
madd15 678b7700b4 Add use Datatable 2015-03-25 12:03:44 +10:30
madd15 1d1c14ae21 Add use Datatable 2015-03-25 12:03:43 +10:30
madd15 3e98f05564 Convert Models and Categories Index to use Datatables 2015-03-25 12:02:32 +10:30
snipe 35bbea3052 Fixes #688 - show model if no asset name 2015-03-24 17:08:15 -07:00
madd15 2c6597c5fb Add deleted_at to select array for datatable 2015-03-23 18:17:41 +10:30
snipe 75d5f494a3 Bypass site name validation if locked 2015-03-20 15:08:10 -07:00
snipe 40852f9a6a Update to settings edit 2015-03-20 15:00:05 -07:00
snipe 80d2347095 Better label layout 2015-03-20 12:38:39 -07:00
snipe fa794d7a15 Basic QR code printing 2015-03-19 18:06:50 -07:00
madd15 8af799614e Update for dataTables 2015-03-19 16:52:52 +10:30
madd15 abf91c7b29 Update for dataTables 2015-03-19 16:08:38 +10:30
madd15 61d916d94d Update for dynamic mac address field 2015-03-19 09:43:34 +10:30
madd15 161d72390b Update edit for notes field 2015-03-18 16:50:15 +10:30
snipe 139d206413 Select specific fields so Chumper has a smaller collection to parse 2015-03-17 18:05:01 -07:00
snipe a341db4cf7 Prevent delete when password lock is active 2015-03-17 17:29:48 -07:00
madd15 fdb92a2012 Change to use eager loaded userloc not assetloc 2015-03-18 10:50:52 +10:30
Madd15 c14761b9a1 Re-fix button not showing 2015-03-18 10:27:04 +10:30
madd15 9edcc39de2 Fix restore button now showing 2015-03-18 10:15:57 +10:30
snipe 94afe20c20 Removed throttle eager load, added userlocation 2015-03-17 16:36:20 -07:00
snipe c00086c740 Fix eager loading for user throttle 2015-03-17 15:36:11 -07:00
snipe c2c0196a3d Eager loading managers, licenses 2015-03-17 14:58:15 -07:00
snipe 46c1f2a28b Server side datatables for user view - needs fix for deleted users 2015-03-16 17:33:41 -07:00
snipe 77fd73bc1b Merge remote-tracking branch 'origin/features/chumper-datatables' into develop 2015-03-16 14:49:51 -07:00
snipe 6f38f76e4a Haha - TOTALLY cheated. But it works. Fixed ordering for linked names 2015-03-14 02:45:49 -07:00
snipe ab0a8b3b61 Added bulk edit back in (it looks like ass right now) 2015-03-14 02:09:21 -07:00
snipe 4243710378 Added location to new assets view 2015-03-14 01:30:12 -07:00
madd15 1f0625cfa1 Better way for locations that works 2015-03-14 15:38:19 +10:30
madd15 5e4175723c Make Location work 2015-03-14 15:22:42 +10:30
madd15 5db853dbdd Move Model And Add Location 2015-03-14 15:19:57 +10:30
snipe 2244c60499 Added category to output 2015-03-13 20:32:47 -07:00
snipe 96e40721b2 Added type to query 2015-03-13 16:50:12 -07:00
snipe 5e5b32e060 Enabled state saving (not working yet, not sure why) 2015-03-12 22:18:43 -07:00