+
+
diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue
index 3014a44c06..7c8dbae002 100644
--- a/resources/assets/js/components/importer/importer-file.vue
+++ b/resources/assets/js/components/importer/importer-file.vue
@@ -117,12 +117,18 @@ tr {
assets: [
{id: 'asset_tag', text: 'Asset Tag' },
{id: 'asset_model', text: 'Model Name' },
+ {id: 'checkout_class', text: 'Checkout Type' },
+ {id: 'checkout_location', text: 'Checkout Location' },
{id: 'image', text: 'Image Filename' },
{id: 'model_number', text: 'Model Number' },
{id: 'full_name', text: 'Full Name' },
{id: 'status', text: 'Status' },
{id: 'warranty_months', text: 'Warranty Months' },
],
+ consumables: [
+ {id: 'item_no', text: "Item Number"},
+ {id: 'model_number', text: "Model Number"},
+ ],
licenses: [
{id: 'expiration_date', text: 'Expiration Date' },
{id: 'license_email', text: 'Licensed To Email' },
@@ -165,6 +171,11 @@ tr {
.concat(this.columnOptions.assets)
.concat(this.columnOptions.customFields)
.sort(sorter);
+
+ case 'consumable':
+ return this.columnOptions.general
+ .concat(this.columnOptions.consumables)
+ .sort(sorter);
case 'license':
return this.columnOptions.general.concat(this.columnOptions.licenses).sort(sorter);
case 'user':
@@ -184,7 +195,6 @@ tr {
},
watch: {
columns() {
- console.log("CHANGED");
this.populateSelect2ActiveItems();
}
},
@@ -234,7 +244,6 @@ tr {
for(var j=0; j < this.columns.length; j++) {
let column = this.columns[j];
let lower = this.file.header_row.map((value) => value.toLowerCase());
- console.dir(lower);
let index = lower.indexOf(column.text.toLowerCase())
if(index != -1) {
this.$set(this.columnMappings, this.file.header_row[index], column.id)
@@ -248,7 +257,6 @@ tr {
}
},
updateModel(header, value) {
- console.log(header, value);
this.columnMappings[header] = value;
}
},
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 0e032dfb44..7296439da8 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -341,3 +341,9 @@ img.navbar-brand-img, .navbar-brand>img {
font-size: 20px;
color: #889195;
}
+
+#login-logo {
+ padding-top: 20px;
+ padding-bottom: 10px;
+ max-width: 200px
+}
diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index c391700b9b..34aa072af0 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -504,6 +504,7 @@ Form::macro('customfield_elements', function ($name = "customfield_elements", $s
$formats = array(
'text' => 'Text Box',
'listbox' => 'List Box',
+ 'textarea' => 'Textarea (multi-line) ',
// 'checkbox' => 'Checkbox',
// 'radio' => 'Radio Buttons',
);
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index ea33cd2f07..1973a6991c 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -167,7 +167,7 @@
// Only display the custom format field if it's a custom format validation type
$(".format").change(function(){
$(this).find("option:selected").each(function(){
- if (($(this).attr("value")=="") && $('.format').prop("selectedIndex") != 0) {
+ if ($('.format').prop("selectedIndex") == 1) {
$("#custom_regex").show();
} else{
$("#custom_regex").hide();
@@ -178,7 +178,7 @@
// Only display the field element if the type is not text
$(".field_element").change(function(){
$(this).find("option:selected").each(function(){
- if($(this).attr("value")!="text"){
+ if (($(this).attr("value")!="text") && ($(this).attr("value")!="textarea")){
$("#field_values_text").show();
} else{
$("#field_values_text").hide();
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 96be1daa8d..db134f7160 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -281,7 +281,7 @@
@if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
{{ $asset->{$field->db_column_name()} }}
@else
- {{ $asset->{$field->db_column_name()} }}
+ {!! nl2br(e($asset->{$field->db_column_name()})) !!}
@endif
@endif
diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index 2fc35c6d0e..3ea432d3ef 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -46,7 +46,7 @@
@if (($snipeSettings) && ($snipeSettings->logo!=''))
+
 }}/uploads/{{ $snipeSettings->logo }})
+
+
@if ($field->element!='text')
@if ($field->element=='listbox')
{{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
Input::old($field->db_column_name(),(isset($item) ? $item->{$field->db_column_name()} : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
+ @elseif ($field->element=='textarea')
+
+
+
@elseif ($field->element=='checkbox')
@foreach ($field->formatFieldValuesAsArray() as $key => $value)
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index 4861b5d7a1..ae271c5835 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -49,8 +49,7 @@
+ previous-input="{{ json_encode(Input::old('default_values')) }}">
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 36c6d3d262..a53cbce60c 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -221,6 +221,13 @@
+
+
+
+