colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied latest StyleCI changes

This commit is contained in:
Dan Brown 2021-12-15 13:49:20 +00:00
parent e43f679e62
commit 73a37b3cd9
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/SearchApiController.php
View File

@ -61,7 +61,7 @@ class SearchApiController extends ApiController
$result->setAttribute('type', $result->getType()); $result->setAttribute('type', $result->getType());
$result->setAttribute('url', $result->getUrl()); $result->setAttribute('url', $result->getUrl());
$result->setAttribute('preview_html', [ $result->setAttribute('preview_html', [
'name' => (string) $result->getAttribute('preview_name'), 'name' => (string) $result->getAttribute('preview_name'),
'content' => (string) $result->getAttribute('preview_content'), 'content' => (string) $result->getAttribute('preview_content'),
]); ]);
} }

2
app/Http/Controllers/UserSearchController.php
View File

@ -14,7 +14,7 @@ class UserSearchController extends Controller
public function forSelect(Request $request) public function forSelect(Request $request)
{ {
$hasPermission = signedInUser() && ( $hasPermission = signedInUser() && (
userCan('users-manage') userCan('users-manage')
|| userCan('restrictions-manage-own') || userCan('restrictions-manage-own')
|| userCan('restrictions-manage-all') || userCan('restrictions-manage-all')
); );

10
tests/Api/SearchApiTest.php
View File

@ -46,7 +46,7 @@ class SearchApiTest extends TestCase
$resp = $this->actingAsApiAdmin()->getJson($this->baseEndpoint . '?query=superuniquevalue'); $resp = $this->actingAsApiAdmin()->getJson($this->baseEndpoint . '?query=superuniquevalue');
$resp->assertJsonFragment([ $resp->assertJsonFragment([
'type' => 'page', 'type' => 'page',
'url' => $page->getUrl(), 'url' => $page->getUrl(),
]); ]);
} }
@ -59,12 +59,12 @@ class SearchApiTest extends TestCase
$resp = $this->actingAsApiAdmin()->getJson($this->baseEndpoint . '?query=superuniquevalue'); $resp = $this->actingAsApiAdmin()->getJson($this->baseEndpoint . '?query=superuniquevalue');
$resp->assertJsonFragment([ $resp->assertJsonFragment([
'type' => 'book', 'type' => 'book',
'url' => $book->getUrl(), 'url' => $book->getUrl(),
'preview_html' => [ 'preview_html' => [
'name' => 'name with <strong>superuniquevalue</strong> within', 'name' => 'name with <strong>superuniquevalue</strong> within',
'content' => 'Description with <strong>superuniquevalue</strong> within', 'content' => 'Description with <strong>superuniquevalue</strong> within',
] ],
]); ]);
} }

4
tests/User/UserSearchTest.php
View File

@ -7,7 +7,6 @@ use Tests\TestCase;
class UserSearchTest extends TestCase class UserSearchTest extends TestCase
{ {
public function test_select_search_matches_by_name() public function test_select_search_matches_by_name()
{ {
$viewer = $this->getViewer(); $viewer = $this->getViewer();
@ -64,5 +63,4 @@ class UserSearchTest extends TestCase
$resp = $this->get('/search/users/select?search=a'); $resp = $this->get('/search/users/select?search=a');
$this->assertPermissionError($resp); $this->assertPermissionError($resp);
} }
}
}