Merge pull request #13288 from snipe/fixes/line_based_markdown

Added Inline markdown method

app/Helpers/Helper.php

@@ -33,6 +33,16 @@ public static function parseEscapedMarkedown($str = null)
  }
  }
 
+ public static function parseEscapedMarkedownInline($str = null)
+ {
+ $Parsedown = new \Parsedown();
+ $Parsedown->setSafeMode(true);
+
+ if ($str) {
+ return $Parsedown->line($str);
+ }
+ }
+
  /**
  * The importer has formatted number strings since v3,
  * so the value might be a string, or an integer.

app/Http/Transformers/AccessoriesTransformer.php

@@ -32,7 +32,7 @@ public function transformAccessory(Accessory $accessory)
  'model_number' => ($accessory->model_number) ? e($accessory->model_number) : null,
  'category' => ($accessory->category) ? ['id' => $accessory->category->id, 'name'=> e($accessory->category->name)] : null,
  'location' => ($accessory->location) ? ['id' => $accessory->location->id, 'name'=> e($accessory->location->name)] : null,
- 'notes' => ($accessory->notes) ? Helper::parseEscapedMarkedown($accessory->notes) : null,
+ 'notes' => ($accessory->notes) ? Helper::parseEscapedMarkedownInline($accessory->notes) : null,
  'qty' => ($accessory->qty) ? (int) $accessory->qty : null,
  'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null,
  'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),

app/Http/Transformers/ActionlogsTransformer.php

@@ -110,7 +110,7 @@ public function transformActionlog (Actionlog $actionlog, $settings = null)
  'type' => e($actionlog->targetType()),
  ] : null,
 
- 'note' => ($actionlog->note) ? Helper::parseEscapedMarkedown($actionlog->note): null,
+ 'note' => ($actionlog->note) ? Helper::parseEscapedMarkedownInline($actionlog->note): null,
  'signature_file' => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null,
  'log_meta' => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null,
  'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),

app/Http/Transformers/AssetMaintenancesTransformer.php

@@ -49,7 +49,7 @@ public function transformAssetMaintenance(AssetMaintenance $assetmaintenance)
  'id' => (int) $assetmaintenance->asset->defaultLoc->id,
  'name'=> e($assetmaintenance->asset->defaultLoc->name),
  ] : null,
- 'notes' => ($assetmaintenance->notes) ? Helper::parseEscapedMarkedown($assetmaintenance->notes) : null,
+ 'notes' => ($assetmaintenance->notes) ? Helper::parseEscapedMarkedownInline($assetmaintenance->notes) : null,
  'supplier' => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id, 'name'=> e($assetmaintenance->supplier->name)] : null,
  'cost' => Helper::formatCurrencyOutput($assetmaintenance->cost),
  'asset_maintenance_type' => e($assetmaintenance->asset_maintenance_type),

app/Http/Transformers/AssetModelsTransformer.php

@@ -63,7 +63,7 @@ public function transformAssetModel(AssetModel $assetmodel)
  'default_fieldset_values' => $default_field_values,
  'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
  'requestable' => ($assetmodel->requestable == '1') ? true : false,
- 'notes' => Helper::parseEscapedMarkedown($assetmodel->notes),
+ 'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
  'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'),
  'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'),
  'deleted_at' => Helper::getFormattedDateObject($assetmodel->deleted_at, 'datetime'),

app/Http/Transformers/AssetsTransformer.php

@@ -58,7 +58,7 @@ public function transformAsset(Asset $asset)
  'id' => (int) $asset->supplier->id,
  'name'=> e($asset->supplier->name),
  ] : null,
- 'notes' => ($asset->notes) ? Helper::parseEscapedMarkedown($asset->notes) : null,
+ 'notes' => ($asset->notes) ? Helper::parseEscapedMarkedownInline($asset->notes) : null,
  'order_number' => ($asset->order_number) ? e($asset->order_number) : null,
  'company' => ($asset->company) ? [
  'id' => (int) $asset->company->id,

app/Http/Transformers/ComponentsTransformer.php

@@ -46,7 +46,7 @@ public function transformComponent(Component $component)
  'id' => (int) $component->company->id,
  'name' => e($component->company->name),
  ] : null,
- 'notes' => ($component->notes) ? Helper::parseEscapedMarkedown($component->notes) : null,
+ 'notes' => ($component->notes) ? Helper::parseEscapedMarkedownInline($component->notes) : null,
  'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'),
  'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'),
  'user_can_checkout' => ($component->numRemaining() > 0) ? 1 : 0,

app/Http/Transformers/ConsumablesTransformer.php

@@ -39,7 +39,7 @@ public function transformConsumable(Consumable $consumable)
  'purchase_cost' => Helper::formatCurrencyOutput($consumable->purchase_cost),
  'purchase_date' => Helper::getFormattedDateObject($consumable->purchase_date, 'date'),
  'qty' => (int) $consumable->qty,
- 'notes' => ($consumable->notes) ? Helper::parseEscapedMarkedown($consumable->notes) : null,
+ 'notes' => ($consumable->notes) ? Helper::parseEscapedMarkedownInline($consumable->notes) : null,
  'created_at' => Helper::getFormattedDateObject($consumable->created_at, 'datetime'),
  'updated_at' => Helper::getFormattedDateObject($consumable->updated_at, 'datetime'),
  ];

app/Http/Transformers/LicensesTransformer.php

@@ -34,7 +34,7 @@ public function transformLicense(License $license)
  'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id,'name'=> e($license->depreciation->name)] : null,
  'purchase_cost' => Helper::formatCurrencyOutput($license->purchase_cost),
  'purchase_cost_numeric' => $license->purchase_cost,
- 'notes' => Helper::parseEscapedMarkedown($license->notes),
+ 'notes' => Helper::parseEscapedMarkedownInline($license->notes),
  'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
  'seats' => (int) $license->seats,
  'free_seats_count' => (int) $license->free_seats_count,

app/Http/Transformers/SuppliersTransformer.php

@@ -43,7 +43,7 @@ public function transformSupplier(Supplier $supplier = null)
  'licenses_count' => (int) $supplier->licenses_count,
  'consumables_count' => (int) $supplier->consumables_count,
  'components_count' => (int) $supplier->components_count,
- 'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedown($supplier->notes) : null,
+ 'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedownInline($supplier->notes) : null,
  'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
  'updated_at' => Helper::getFormattedDateObject($supplier->updated_at, 'datetime'),
 

app/Http/Transformers/UsersTransformer.php

@@ -53,7 +53,7 @@ public function transformUser(User $user)
  'id' => (int) $user->userloc->id,
  'name'=> e($user->userloc->name),
  ] : null,
- 'notes'=> Helper::parseEscapedMarkedown($user->notes),
+ 'notes'=> Helper::parseEscapedMarkedownInline($user->notes),
  'permissions' => $user->decodePermissions(),
  'activated' => ($user->activated == '1') ? true : false,
  'autoassign_licenses' => ($user->autoassign_licenses == '1') ? true : false,

app/Presenters/AssetModelPresenter.php

@@ -123,6 +123,7 @@ public static function dataTableLayout()
  'switchable' => true,
  'title' => trans('general.notes'),
  'visible' => false,
+ 'formatter' => 'notesFormatter',
  ],
  [
  'field' => 'created_at',

resources/views/accessories/view.blade.php

@@ -287,7 +287,7 @@ class="table table-striped snipe-table"
  </strong>
  </div>
  <div class="col-md-9">
- {!! nl2br(e($accessory->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
  </div>
  </div>
 

resources/views/asset_maintenances/view.blade.php

@@ -93,7 +93,7 @@
  <div class="row">
  <div class="col-md-12 col-sm-12" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
  <strong>{{ trans('admin/asset_maintenances/form.notes') }}: </strong>
- {{ $assetMaintenance->notes }}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($assetMaintenance->notes)) !!}
  </div>
  </div>
  <!-- 5th Row End -->

resources/views/consumables/view.blade.php

@@ -155,7 +155,7 @@ class="table table-striped snipe-table"
 
  <td>
  @if ($file->note)
- {{ $file->note }}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($file->note)) !!}
  @endif
  </td>
  <td>
@@ -275,7 +275,7 @@ class="table table-striped snipe-table"
  </strong>
  </div>
  <div class="col-md-12">
- {!! nl2br(e($consumable->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($consumable->notes)) !!}
  </div>
  </div>
  @endif

resources/views/hardware/view.blade.php

@@ -730,7 +730,7 @@
  </strong>
  </div>
  <div class="col-md-6">
-  {!! nl2br(e($asset->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!}
  </div>
  </div>
 

resources/views/licenses/view.blade.php

@@ -357,7 +357,7 @@
  </strong>
  </div>
  <div class="col-md-9">
- {!! nl2br(e($license->notes)) !!}
+ {!! nl2br(Helper::parseEscapedMarkedownInline($license->notes)) !!}
  </div>
  </div>
  @endif

resources/views/suppliers/view.blade.php

@@ -338,7 +338,7 @@ class="table table-striped snipe-table"
  @endif
 
  @if ($supplier->notes!='')
- <li><i class="fa fa-comment"></i> {{ $supplier->notes }}</li>
+ <li><i class="fa fa-comment"></i> {!! nl2br(Helper::parseEscapedMarkedownInline($supplier->notes)) !!}</li>
  @endif
 
  </ul>

resources/views/users/view.blade.php

@@ -633,7 +633,7 @@
  {{ trans('admin/users/table.notes') }}
  </div>
  <div class="col-md-9">
- {{ $user->notes }}
+  {!! nl2br(Helper::parseEscapedMarkedownInline($user->notes)) !!}
  </div>
 
  </div>