Commit graph

370 commits

Author SHA1 Message Date
snipe
3e4be6671e Updated categories with resty routes 2016-12-15 16:42:47 -08:00
snipe
f182a7db2a Removed leading slash for url helper 2016-12-15 16:42:14 -08:00
snipe
aab0933856 Use url() helper over URL::to 2016-12-15 16:41:36 -08:00
snipe
b7a2c4c26d Use Request instead of Input:: 2016-12-15 15:56:52 -08:00
snipe
c6ab34faee Updated Companies for #3059 2016-12-15 15:48:30 -08:00
snipe
6c8e9327c1 Fixed Request path 2016-12-15 15:47:08 -08:00
snipe
cf2b57cb15 More for #3057 2016-12-15 15:15:11 -08:00
snipe
ad1bf86a08 And still more license route updates 2016-12-15 13:07:34 -08:00
snipe
bea1a93e9b More license route updates 2016-12-15 12:48:15 -08:00
snipe
1ab414453f Use $request instead of Input:: 2016-12-15 12:47:12 -08:00
snipe
eb9207d0fe Fixed license routes in getDataTable 2016-12-15 12:14:16 -08:00
snipe
0c5d3d1c74 Updated license routes 2016-12-15 11:57:19 -08:00
snipe
a6b975b168 More updates for #3060, #3058 2016-12-15 06:11:03 -08:00
snipe
e67b3e474f Use more RESTy method names, uses route names where possible (#3059, #3060) 2016-12-15 04:09:40 -08:00
snipe
37c847ea08 Clearer/updated/named custom fields routes
This is still broken
2016-12-14 09:56:23 -08:00
snipe
7c774352e5 Fix depreciated lists() method 2016-12-14 09:55:35 -08:00
snipe
863e200430 Hopefully fixes tons of PEBKAC where users have the wrong app.url 2016-12-14 08:20:05 -08:00
snipe
68ac4abe2c Updated throttling override for 5.3 2016-12-14 06:30:51 -08:00
snipe
433adb1dcb Updated traits and method names for 5.3 2016-12-14 05:06:51 -08:00
snipe
5cd7e84d98 Renamed Password controllers to new 5.3 versions 2016-12-14 05:06:15 -08:00
snipe
65db55908a Rename to AuthController to LoginController 2016-12-14 04:30:56 -08:00
Daniel Meltzer
927a12f78d Fix #2985. Missed in the field rename (#3014) 2016-12-05 15:09:14 -08:00
snipe
7ccef51a4f Removed some dumb comments 2016-12-01 02:25:53 -08:00
snipe
4c418bf622 Remove unused $request variable 2016-12-01 02:13:00 -08:00
snipe
16cfdbaa93 Redirect the lost password success back to login 2016-12-01 02:04:43 -08:00
snipe
3f8f6ad981 Fixes #2995 - adds max login attempts/duration as .env option 2016-12-01 02:04:15 -08:00
snipe
d8d800bb7a Fixes #2997 - don’t include soft-deleted maintenances 2016-12-01 00:55:00 -08:00
snipe
68b9ffb908 Only allow login via LDAP if the user was already imported or created via LDAP 2016-12-01 00:29:45 -08:00
snipe
6c366eb112 Fixes potential login issue if password syncing is set to true 2016-11-30 20:39:43 -08:00
snipe
f5e100a6a5 Only allow asset files to be deleted, maintenances to be added if user has assets.edit permission 2016-11-29 13:37:45 -08:00
snipe
abcc01f5e0 More language string corrections 2016-11-29 12:48:00 -08:00
snipe
4dbe8fad30 More language string fixes 2016-11-29 08:46:33 -08:00
snipe
7bf1664b8f Allow XML mimetypes 2016-11-29 08:01:08 -08:00
snipe
b0d8711002 Add .lic as possible license file type 2016-11-29 07:22:45 -08:00
snipe
53404f3d1c Fixes asset model clone 2016-11-29 06:16:52 -08:00
snipe
f605821143 Remove unneeded use statements 2016-11-29 06:14:33 -08:00
snipe
cab331f3f8 Link model name in category view 2016-11-29 06:14:20 -08:00
snipe
eb340b0fa9 Add fieldset to asset model listing 2016-11-29 06:06:52 -08:00
Daniel Meltzer
263f19bdad Fix error in partializing with creating an asset maintenance. (#2987) 2016-11-29 05:02:48 -08:00
snipe
81a0e06c40 Automatically log the user in after user creation 2016-11-29 01:19:25 -08:00
Daniel Meltzer
b8cbf0022e Log fixes (#2972)
* Make sure we set target_type when creating an accept asset log, and add a migration to fix older ones.

* On a declined log, we don't have an assigned user.

 Guard against this conditional (which realistically should never be hit?)
Should fix #2940

* Fix codacy issues with migration.
2016-11-24 12:48:14 -08:00
snipe
45c789021e Add employee number option to custom report 2016-11-23 05:17:54 -08:00
snipe
54dec2147c Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-11-21 18:40:38 -08:00
snipe
bc84f80e20 Check if sig_filename exists 2016-11-21 18:40:26 -08:00
Daniel Meltzer
ac9fd3b3bb Update LicensesController.php (#2948)
* Update LicensesController.php

Should fix #2939.  Cannot test at the moment, so please check :)

* Add delete tests.  Improve test item generation.

* Add relationship here.

* Fix some issues with seeding.
2016-11-20 19:59:57 -08:00
snipe
d8eb68af83 Merge branch 'hotfixes/accessory_model_number' into develop
# Conflicts:
#	resources/views/accessories/edit.blade.php
2016-11-17 20:01:01 -08:00
snipe
d0d9d82579 Add model number to accessories 2016-11-17 19:57:53 -08:00
Daniel Meltzer
55ccc000eb Fix loggable checkin (#2935)
* Log the user items are checked in from

This restores functionality that was lost in the port to loggable.
I'd still like to figure out a better term for the table, currently it says to, but I wonder if target is a better choice?

* Fix display of remaining seats on license view
2016-11-17 15:54:29 -08:00
Daniel Meltzer
d722ed3823 Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.

This is a large code change that doesn't do much immediately.  It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.

In addition, I've gone ahead and renamed a few database fields.  We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number.  We had items using ::note and ::notes, I've standardized
on ::notes.  Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.

TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.

Rename assetmodel::modelno to model_number for clarity and consistency

Rename consumable::model_no to model_number for clarity and consistency

Rename assetmodel::note to notes for clarity and consistency

Port asset and assetmodel to new partials layout.  Adapt all code to the renamed model_number and notes database changes.  Fix some stying.

* Share a settings variable with all views.

* Allow editing the per_page setting.  We showed the value, but we never showed it on the edit page..

* use snipeSettings in all views instead of the long ugly path.

* War on partials. Centralize all bootstrap table javascript

* Use model_number instead of modelno in importer

* Codacy fix.

* More unification/deduplication.  Create an edit form template layout that we use as the base for all edit forms.  This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.

* Use a ViewComposer instead of sharing the variable directly.  Fixes artisan optimize trying to hit the db--which ruins new installs

* Fix DB seeder.

* Base sql dump and csv's to import data from for tests.

* Start some functional tests for creating items.

* Add functional tests for all create methods.  Still need to do tests for edits, deletes, and lots of other things

* Improvements to functional tests.

Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.

* Some improvements to acceptance tests.

Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.

I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.

* A few things to make acceptance tests work.  Add a name to the companies table, and make the locations table have the correct name

* Use a .env.tests file for testing functional and unit to allow a separate database.

* Add functional tests for compoents, groups, and licenses.

* Now that the config is in the functional.yml, this just confuses things.

* Start some functional tests for creating items.

* Add functional tests for all create methods.  Still need to do tests for edits, deletes, and lots of other things

* Improvements to functional tests.

Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.

* Some improvements to acceptance tests.

Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.

I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.

* update db dump

* Update tests to new reality

* env for the test setup

* only load the database at beginning of tests, not between each Functional test.

* Fix a miss from renaming note to notes.

* Set Termination date when creating an asset.  It was only set on edit.

* Rename serial_number to serial in components for consistency.

* Update validation rules to match limits in database.  Currently we just accepted the values and they were truncated when adding to DB.

* Much more detailed functional testing of creating items.  This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
snipe
84e06f4642 Add postal code to locations listing 2016-11-16 08:22:54 -08:00