Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27,080 changes: 27,078 additions & 2 deletions dist/js/field.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/js/components/FormField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default {
let baseUrl = '/nova-vendor/nova-attach-many/';

if(this.resourceId) {
Nova.request(baseUrl + this.resourceName + '/' + this.resourceId + '/attachable/' + this.field.attribute)
Nova.request(baseUrl + this.resourceName + '/' + this.resourceId + '/attachable/' + this.field.attribute + this.field.orderBy)
.then((data) => {
if(keepSelected) {
this.selected = _.intersection(this.selected, _.map(data.data.available, 'value'));
Expand All @@ -98,7 +98,7 @@ export default {
});
}
else {
Nova.request(baseUrl + this.resourceName + '/attachable/' + this.field.attribute)
Nova.request(baseUrl + this.resourceName + '/attachable/' + this.field.attribute + this.field.orderBy)
.then((data) => {
this.available = data.data.available || [];
this.loading = false;
Expand Down
24 changes: 23 additions & 1 deletion src/AttachMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class AttachMany extends Field

public $height = '300px';

public $orderBy = '';

public $fullWidth = false;

public $showToolbar = true;
Expand Down Expand Up @@ -57,7 +59,7 @@ public function __construct($name, $attribute = null, $resource = null)

// fetch the submitted values
$values = json_decode(request()->input($attribute), true);

// if $values is null make it an empty array instead
if (is_null($values)) {
$values = [];
Expand Down Expand Up @@ -100,6 +102,7 @@ public function resolve($resource, $attribute = null)
{
$this->withMeta([
'height' => $this->height,
'orderBy' => $this->orderBy,
'fullWidth' => $this->fullWidth,
'showCounts' => $this->showCounts,
'showPreview' => $this->showPreview,
Expand Down Expand Up @@ -149,6 +152,25 @@ public function height($height)
return $this;
}

public function orderBy($orderByArr)
{
$this->orderBy = '';
if (count($orderByArr)) {
$this->orderBy = '?orderby=';
foreach ($orderByArr as $key => $value) {
if (is_numeric($key)) {
$this->orderBy .= $value . ':asc,';
} else {
$direction = (strtolower($value) == 'desc' ? 'desc' : 'asc');
$this->orderBy .= $key . ':' . $direction . ',';
}
}
$this->orderBy = rtrim($this->orderBy, ',');
}

return $this;
}

public function fullWidth($fullWidth=true)
{
$this->fullWidth = $fullWidth;
Expand Down
26 changes: 19 additions & 7 deletions src/Http/Controllers/AttachController.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,25 @@ public function getAvailableResources($request, $relationship)

$query = $field->resourceClass::newModel();

return forward_static_call($this->associatableQueryCallable($request, $query), $request, $query)->get()
->mapInto($field->resourceClass)
->filter(function ($resource) use ($request, $field) {
return $request->newResource()->authorizedToAttach($request, $resource->resource);
})->map(function ($resource) use ($request, $field) {
return $field->formatAssociatableResource($request, $resource);
})->values();
$orderByCSV = $request->query('orderby');

$queryBuilder = forward_static_call($this->associatableQueryCallable($request, $query), $request, $query);

if ($orderByCSV) {
$orderBys = array_map('trim', explode(',', $orderByCSV));
foreach ($orderBys as $orderBy) {
list($column, $direction) = explode(':', $orderBy);
$queryBuilder = $queryBuilder->orderBy($column, $direction);
}
}

return $queryBuilder->get()
->mapInto($field->resourceClass)
->filter(function ($resource) use ($request, $field) {
return $request->newResource()->authorizedToAttach($request, $resource->resource);
})->map(function ($resource) use ($request, $field) {
return $field->formatAssociatableResource($request, $resource);
})->values();
}

/**
Expand Down