[koha-commits] main Koha release repository branch master updated. v3.14.00-alpha2-128-g021b629
Git repo owner
gitmaster at git.koha-community.org
Thu Oct 31 17:27:48 CET 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 021b6299754f93f89271f81ef9fc864f75391515 (commit)
via 91220134e63a2265655ffaca0c399caae3bbaf1b (commit)
via 950b403efe58a53e30a621e11b9464babb07acd4 (commit)
via b027b47aa08e6c1735d2e1bc51185fa46cd3038d (commit)
via fe777ef937007db24968944c485fccdda170118d (commit)
via 54616c37e25b969907f9da2cf021e7e23ced836c (commit)
from 6e3e1eed4829f1b11e571e2c77a8b37f66af943d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 021b6299754f93f89271f81ef9fc864f75391515
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 31 16:33:17 2013 +0000
Bug 7295: DBRev 3.13.00.039
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 91220134e63a2265655ffaca0c399caae3bbaf1b
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 31 16:32:51 2013 +0000
Bug 7295: (follow-up) update DBIx::Class schema classes
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 950b403efe58a53e30a621e11b9464babb07acd4
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 31 16:30:29 2013 +0000
Bug 7295: (follow-up) fix syntax error in kohastructure.sql
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b027b47aa08e6c1735d2e1bc51185fa46cd3038d
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Jul 18 11:04:08 2013 +0200
Bug 7295 (follow-up) replace simple-quoted string by double-quoted string
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit fe777ef937007db24968944c485fccdda170118d
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Jul 17 10:51:36 2012 +0200
Bug 7295: (follow-up) several fixes
- List of libraries in basket.pl is now sorted by branch name, not code
- When IndependantBranches is ON, user has only the possibility to set
basket branch to its own branch, or to no branch at all.
- When basket do not belong to any branch, selected branch by default is
connection branch (was 'no branch')
- added id attributes to both added li elements
- change description of 'order_manage_all' permission to make it
clearer.
- remove Test::MockModule dependency
Signed-off-by: Sonia Bouis <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 54616c37e25b969907f9da2cf021e7e23ced836c
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Apr 20 17:12:29 2012 +0200
Bug 7295: More granular permissions for baskets
- Add branch info to baskets
- Add a list of borrowers that are allowed to manage a basket (one list
for each basket).
- Add a new subpermission: acquisition => order_manage_all
If user is superlibrarian, or if that user has permission acquisition = 1
(GranularPermissions = OFF), or subpermission acquisition =>
order_manage_all (GranularPermissions = ON), that user is authorised to manage
all baskets.
Depending on syspref AcqViewBaskets:
'all': user can manage all baskets
'branch': user can manage baskets of their branch (the basket branch is
taken into account, not the branch of the basket's creator).
If basket branch is not defined, all users can manage this
basket.
'user': user can manage baskets she created, and baskets in their
user list
There are unit tests in t/Acquisition/CanUserManageBasket.t, which
require Test::MockModule
You can edit basket's branch and users list in basket modification page
(acqui/basket.pl)
Signed-off-by: Sonia Bouis <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 149 +++++++++++++-
Koha/Schema/Result/Aqbasket.pm | 58 +++++-
.../{CourseInstructor.pm => Aqbasketuser.pm} | 42 ++--
Koha/Schema/Result/Borrower.pm | 29 ++-
Koha/Schema/Result/Branch.pm | 19 +-
acqui/aqbasketuser_search.pl | 77 ++++++++
acqui/basket.pl | 71 ++++++-
acqui/booksellers.pl | 19 +-
.../data/mysql/de-DE/mandatory/userpermissions.sql | 1 +
.../data/mysql/en/mandatory/userpermissions.sql | 1 +
.../data/mysql/es-ES/mandatory/userpermissions.sql | 1 +
.../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 +
.../data/mysql/it-IT/necessari/userpermissions.sql | 1 +
installer/data/mysql/kohastructure.sql | 17 +-
.../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 1 +
.../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 +
.../ru-RU/mandatory/permissions_and_user_flags.sql | 1 +
.../uk-UA/mandatory/permissions_and_user_flags.sql | 1 +
installer/data/mysql/updatedatabase.pl | 33 ++++
.../prog/en/modules/acqui/aqbasketuser_search.tt | 79 ++++++++
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 88 ++++++++-
.../en/modules/admin/preferences/acquisitions.pref | 2 +-
kohaversion.pl | 2 +-
t/Acquisition/CanUserManageBasket.t | 204 ++++++++++++++++++++
24 files changed, 846 insertions(+), 52 deletions(-)
copy Koha/Schema/Result/{CourseInstructor.pm => Aqbasketuser.pm} (62%)
create mode 100755 acqui/aqbasketuser_search.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/aqbasketuser_search.tt
create mode 100644 t/Acquisition/CanUserManageBasket.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list