Commit graph

2164 commits

Author SHA1 Message Date
snipe
ccb7556281 Fixes javascript error when custom fields exist but do not belong to any fieldsets or models 2017-07-26 17:06:58 -07:00
snipe
ee7348d0d5 Better fix for javascript formatter for employee number 2017-07-26 16:47:47 -07:00
snipe
7d6bf4ac24 Fixes stupid javascript for employee_number 2017-07-26 16:26:47 -07:00
snipe
cb903ab9fd Fixes manager user->name to username in Users API 2017-07-26 08:51:16 -07:00
snipe
66d8308163 More compact payload for users API on location and manager 2017-07-26 08:47:54 -07:00
snipe
847262e989 Fixes #3774 - fixes for inconsistent API responses (‘’ vs null) and adds escaping 2017-07-25 23:40:30 -07:00
snipe
59006964d1 Fixes #3771 - adds username to API response on Asset API 2017-07-25 22:11:50 -07:00
snipe
ac29b142dc Adds max thumbnail width to asset listings, settings 2017-07-25 19:36:38 -07:00
snipe
978a906513 Fixes undefined error when validation fails on asset save 2017-07-25 19:32:09 -07:00
snipe
dfa0714d44 Fixes #3770 - account update not saving correctly 2017-07-25 12:28:11 -07:00
snipe
0fbf9236f4 Fixes #3742 - add employee number to asset listing
Also removes asset report, since it’s basically the exact same output as the asset listing
2017-07-25 01:17:23 -07:00
snipe
c64ca76b3d Fixes API route 2017-07-25 01:16:31 -07:00
snipe
73052d3fc1 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-07-25 00:24:26 -07:00
snipe
ae0b639d0c Added link to AGPL 2017-07-25 00:24:22 -07:00
Jan Felix Wiebe
5cc84ca137 Use correct array when deleting users with location (#3769) 2017-07-24 23:15:15 -07:00
snipe
29f1cf2b48 Increase depreciation max 2017-07-19 19:41:21 -07:00
snipe
7510f9f128 Fixes #3753 - use route direction instead of URL 2017-07-17 16:42:39 -07:00
snipe
7c6143bbb8 Fixes #3754 - incorrect language translation location for supplier 2017-07-17 16:39:19 -07:00
snipe
346156bae1 Added colored icons to indicate status types versus status labels 2017-07-17 16:19:52 -07:00
snipe
3eea1a23f8 Slug the filename
So upoloads with weird characters like parens don’t get hoarked when trying to delete
2017-07-14 02:38:13 -07:00
snipe
1fda4593c1 Update @gibsonjoshua55 as a contributor 2017-07-12 20:41:20 -07:00
snipe
6b5a0983ee Added model validation to custom fieldsets 2017-07-12 19:34:45 -07:00
snipe
ad12a5ce11 Added store/update methods to custom fields API 2017-07-12 19:34:34 -07:00
snipe
ec09ea53db Changed custom fieldset API routes to resource routes for consistency 2017-07-12 19:24:21 -07:00
snipe
5abe72ce02 Added whether the field is required to the custom fieldsets transformer 2017-07-12 19:23:54 -07:00
snipe
3e3276334b Added escaping to API output 2017-07-12 19:23:15 -07:00
snipe
b13e04095e Removed commented code 2017-07-12 19:22:58 -07:00
gibsonjoshua55
3cfcc43efa Adds basic GET api support for CustomFieldsets (#3697)
* Adds basic GET api support for CustomFieldsets

Currently there is not support for getting what fields a given fieldset contains
from the API.  This commit creates a new API Controller for CustomFieldsets as
well as Transformers for CustomFields CustomFieldsets.  Additionally, the api
route has been updated so that a show method can be access from
http://myapp/api/v1/fieldsets/{id}

* CustomFieldsetsTransformer only returns id and name of model

* Added index api method for CustomFieldsets

* Removes copy/paste error in CustomFieldsetController (including search)

* Added id to CustomFieldsetsTransformers

* Adds custom_fieldset_id as a field when storing and updating AssetModels

* Removed uncessesary parameter from CustomFieldsetsController.index

* Cleaned up CustomFieldset API
2017-07-12 17:51:22 -07:00
Daniel Meltzer
f432f98e12 Importer tests + Fixes (#3733)
* Fix Bug in User::generateFormattedNameFromFullName

In a name "John Doe", this method would split it into "John" and " Doe",
Leaving a space in the last name when importing to the database.  Strip
this space.

* Cleanup/fix some item mapping.

Also make some changes to the importer schema to allow for unit testing.
Generate a default item mapping, and then merge that with any custom
mappings.

* Beginning work on importer unit tests.

* Strip out testrun branches from importer.  It added a lot of complexity and was not terribly useful with web importer as it stood, might reconsider down the road however.

* Normalize the mapped keys when using custom field mappings.

* Add test for custom asset import mapping.

* Make all unit tests inherit from a new custom base.

This baseclass currently calls Artisan::migrate() and seeds a Settings
instance.  This fixes unit tests after the autoincrement bits.

* Store requestable as a boolean.  Fixes some import oddities

* Work on tests for accessory importer.

* Test for custom mapping of accessory import, also adjust the internal field for purchase date.

* Update default locale fallback for currency detection

* Fix Reassignable in consumable as well.

* More importer tests and fixes.
2017-07-11 20:37:02 -07:00
Sorvani
f56862c684 change CentOS 7 to pull from git (#3734)
The package setup for CentOS 7 already installs git so use it for the install. This makes later updates easier for the end users. They can simply use git pull like the instructions say for updating.
2017-07-11 20:28:31 -07:00
snipe
9bcfe0748b Make custom fields into their own JSON array 2017-07-08 18:44:28 -07:00
snipe
de5e7bd9ba Removed null formatter 2017-07-08 17:04:52 -07:00
snipe
635299cd74 Decrypt encrypted fields 2017-07-08 17:04:40 -07:00
snipe
20376daec4 Fix encryption on first save 2017-07-08 17:04:24 -07:00
snipe
50e1570543 Added additional models for #3702 2017-07-08 14:49:43 -07:00
snipe
eb94c4333d Fixes #3702 - Added artisan command to walk through special characters and unescape them in the DB 2017-07-08 14:47:43 -07:00
snipe
a49fd16916 Fixed delete file settings route 2017-07-08 13:42:05 -07:00
snipe
0cc9c214aa Added tooltip for undeployable items 2017-07-08 13:39:07 -07:00
snipe
c48bcb7ed1 Added tooltips for checkin/checkout 2017-07-08 13:36:37 -07:00
snipe
09de201027 Removed question mark on delete title 2017-07-08 13:36:25 -07:00
snipe
6ce2127d75 Fixes incorrect link on dashboard 2017-07-08 13:36:06 -07:00
snipe
e79260a0d4 Fixes #3732 - broken tooltips and weird select2 option text behavior
The solve here was a few things - first, load jquery-ui before bootstrap. They have conflicting tooltips. Second, initiate the tooltips in the wenzhixin/bootstrap-table formatter using `data-tooltip=“true”`, and thirdly, add some JS that tells BS table to inititalize tooltips within the table using that `data-tooltip=“true”` business
2017-07-08 13:21:13 -07:00
snipe
932e25ca9b Only add an update log message if the asset isn’t being checked in or out 2017-07-08 03:38:39 -07:00
snipe
b02148f59e Updated formatter for location display 2017-07-08 02:24:30 -07:00
snipe
6046063666 Updated LDAP icon 2017-07-08 02:24:20 -07:00
snipe
fd57617c8e Check that the LDAP extension is loaded and functions are available 2017-07-08 01:48:29 -07:00
snipe
44569558e9 Remove admin label 2017-07-08 01:41:07 -07:00
snipe
d2f6c8af11 Require first name field if LDAP is enabled 2017-07-08 01:40:56 -07:00
snipe
814bf18a4b Updated phpinfo title 2017-07-08 00:23:28 -07:00
snipe
33557f3792 Nicer formatting for phpinfo output 2017-07-08 00:22:30 -07:00