[Koha-bugs] [Bug 6828] Add Admin Dashboard for staff users.

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6828

--- Comment #28 from Cab Vinton <bibliwho at gmail.com> ---
(In reply to Jonathan Druart from comment #22)
> Did you test the rebase patches?

So I've learned how to sign off on patches, but the status of this patch is
Failed QA.

If a dashboard XML file needs to be created, then not sure whether testing via
a sandbox would work.

Tried Sandbox 06 anyway & got the following:

The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 6828:
<h1>Something went wrong !</h1>Applying: Bug 6828[ENH] - Add basic Dashboard
for staff users.
.git/rebase-apply/patch:483: trailing whitespace.

warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       C4/Auth.pm
M       installer/data/mysql/sysprefs.sql
M       installer/data/mysql/updatedatabase.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
M       mainpage.pl
.git/rebase-apply/patch:483: trailing whitespace.

warning: 1 line applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging mainpage.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging C4/Auth.pm
CONFLICT (content): Merge conflict in C4/Auth.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 6828[ENH] - Add basic Dashboard for staff users.
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run git bz apply --continue.
If you would prefer to skip this patch, instead run git bz apply --skip.
To restore the original branch and stop patching run git bz apply --abort.
Bug 6828 - Add Admin Dashboard for staff users.

10217 - [SIGNED-OFF] Bug 6828[ENH] - Add basic Dashboard for staff users.
10218 - [SIGNED-OFF] Bug 6828 follow-up: adapt dashboard to new staff client
theme
60692 - Bug 6828[ENH] - Add basic Dashboard for staff users.
60693 - Bug 6828 follow-up: adapt dashboard to new staff client theme

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/SIGNED-OFF-Bug-6828ENH---Add-basic-Dashboard-for-s-EpoHfa.patch .

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.