Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2015-12-15 19:53:46 +0000
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
497747e621355ee002b73806db5ed7ae43d492f7
497747e6
1 parent
af331563
Fixed issue with deleted users in page revision list & extended tests to cover.
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
7 deletions
app/Repos/PageRepo.php
resources/views/pages/revisions.blade.php
tests/EntityTest.php
app/Repos/PageRepo.php
View file @
497747e
...
...
@@ -269,7 +269,7 @@ class PageRepo
* @param Page $page
* @return $this
*/
p
rivate
function
saveRevision
(
Page
$page
)
p
ublic
function
saveRevision
(
Page
$page
)
{
$revision
=
$this
->
pageRevision
->
fill
(
$page
->
toArray
());
$revision
->
page_id
=
$page
->
id
;
...
...
resources/views/pages/revisions.blade.php
View file @
497747e
...
...
@@ -32,8 +32,12 @@
@foreach($page->revisions as $revision)
<tr>
<td>
{{$revision->name}}
</td>
<td
style=
"line-height: 0;"
><img
class=
"avatar"
src=
"{{ $revision->createdBy->getAvatar(30) }}"
alt=
"{{$revision->createdBy->name}}"
></td>
<td>
{{$revision->createdBy->name}}
</td>
<td
style=
"line-height: 0;"
>
@if($revision->createdBy)
<img
class=
"avatar"
src=
"{{ $revision->createdBy->getAvatar(30) }}"
alt=
"{{$revision->createdBy->name}}"
>
@endif
</td>
<td>
@if($revision->createdBy) {{$revision->createdBy->name}} @else Deleted User @endif
</td>
<td><small>
{{$revision->created_at->format('jS F, Y H:i:s')}} ({{$revision->created_at->diffForHumans()}})
</small></td>
<td>
<a
href=
"{{$revision->getUrl()}}"
target=
"_blank"
>
Preview
</a>
...
...
tests/EntityTest.php
View file @
497747e
...
...
@@ -173,26 +173,40 @@ class EntityTest extends TestCase
public
function
testEntitiesViewableAfterCreatorDeletion
()
{
// Create required assets and revisions
$creator
=
$this
->
getNewUser
();
$updater
=
$this
->
getNewUser
();
$entities
=
$this
->
createEntityChainBelongingToUser
(
$creator
,
$updater
);
$this
->
actingAs
(
$creator
);
app
(
'BookStack\Repos\UserRepo'
)
->
destroy
(
$creator
);
app
(
'BookStack\Repos\PageRepo'
)
->
saveRevision
(
$entities
[
'page'
]);
$this
->
asAdmin
()
->
visit
(
$entities
[
'book'
]
->
getUrl
())
->
seeStatusCode
(
200
)
->
visit
(
$entities
[
'chapter'
]
->
getUrl
())
->
seeStatusCode
(
200
)
->
visit
(
$entities
[
'page'
]
->
getUrl
())
->
seeStatusCode
(
200
);
$this
->
checkEntitiesViewable
(
$entities
);
}
public
function
testEntitiesViewableAfterUpdaterDeletion
()
{
// Create required assets and revisions
$creator
=
$this
->
getNewUser
();
$updater
=
$this
->
getNewUser
();
$entities
=
$this
->
createEntityChainBelongingToUser
(
$creator
,
$updater
);
$this
->
actingAs
(
$updater
);
app
(
'BookStack\Repos\UserRepo'
)
->
destroy
(
$updater
);
app
(
'BookStack\Repos\PageRepo'
)
->
saveRevision
(
$entities
[
'page'
]);
$this
->
asAdmin
()
->
visit
(
$entities
[
'book'
]
->
getUrl
())
->
seeStatusCode
(
200
)
$this
->
checkEntitiesViewable
(
$entities
);
}
private
function
checkEntitiesViewable
(
$entities
)
{
// Check pages and books are visible.
$this
->
asAdmin
();
$this
->
visit
(
$entities
[
'book'
]
->
getUrl
())
->
seeStatusCode
(
200
)
->
visit
(
$entities
[
'chapter'
]
->
getUrl
())
->
seeStatusCode
(
200
)
->
visit
(
$entities
[
'page'
]
->
getUrl
())
->
seeStatusCode
(
200
);
// Check revision listing shows no errors.
$this
->
visit
(
$entities
[
'page'
]
->
getUrl
())
->
click
(
'Revisions'
)
->
seeStatusCode
(
200
);
}
...
...
Please
register
or
sign in
to post a comment