Commit graph

37 commits

Author SHA1 Message Date
Katrin Fischer
88a2079a48 Bug 7523: Improve checks for routing permissions
- system preference RoutingSerials and user permission routing
  should be taken into account
- print routing list should be independent from routing permission

To test, compare to master and check:

1) If system preference RoutingSerials is OFF, routing list functionality is
not visible in the templates.

2) If system preference RoutingSerials is ON, but user doesn't have routing
permission, routing list functionality is not visible in templates,
with exception of 'print list' on the serial collection page.

3) If system preference RoutingSerials is ON and user has routing permissions,
all routing links are visible (serial collection, serials navigation,
result list of serial search)

Additional changes:
Changed labels on templates to match HTML4 rule from coding guidelines.
http://wiki.koha-community.org/wiki/Coding_Guidelines#Upper_and_Lower_cases_in_strings

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-27 18:22:01 +01:00
Liz Rea
1ddc9322df Bug 7546 - cannot view subscription detail
This patch adds a C4::Search to subscription-detail.pl to compensate for a removed
one from auth.pm during the denesting effort.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Bug 7546 Do not call routine as bareword

Fixes compilation errors due to calling routine without parens
Also nothing was gained (and obfuscation added) by forcing
the return into a hash ref have changed variable to hash
tidied up the if else chain

These routines should be refactored out future

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

bug 7546 follow-up, enabled_staff_search_views problem

* enabled_staff_search_views was not exported by C4::Search, should have been
* serials/serials-edit.pl were also missing it

Comments:
* checked with for file in */*.pl; do perl -wc $file; done that no script was still having this problem

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Final sign off for all 3 patches
Note: I had some problems with tests, but it is probably related to my data and not this patch.
2012-02-17 09:05:54 +01:00
Colin Campbell
d2c24f3bbf Bug 6790: Remove unnecessary variable from getroutinglist return
getroutinglist returns a count variable to indicate how many elements
are in the array. This is almost always a serious code smell. (We are
programming in a list manipulating language) The routine was executing
am unnecessary loop just to maintain that var.
Removed the variable from the routine and perldoc
refactored calls of the routine removed the c-style loops for
more idiomatic and maintainable for loops
renamed some opaquely named variables
removed a call to the routine where nothing was done with the data
moved some html out of the calling script and into the template

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-23 17:59:27 +01:00
Chris Cormack
c3912ebf90 Bug 6202 : Fix for showing subscription details
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-20 16:03:36 +12:00
e54169ba0f Incremental fix for Bug 3285 - Location on Add Subscription should be pull down
- Adds location dropdown to subscription edit form
- Pulls authorised value for display on subscription detail page
- Adds function for pulling authorised value description based
  on category and value

This patch does NOT implement automatic preselection of the shelving
location form field on the serial add item screen. This must be
worked out in order for the bug to be closed.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-07 09:29:05 +13:00
Colin Campbell
48a10d3183 Bug 5032 Remove duplicate code
Two duplicate calls to GetSerials appear to have been merged in
to no purpose other than to generate warnings

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 07:56:53 -04:00
Chris Cormack
b3feb54ee0 Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

Conflicts:

	installer/data/mysql/en/mandatory/userpermissions.sql
	installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
	installer/data/mysql/updatedatabase30.pl
	koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
	serials/member-search.pl
	serials/serials-edit.pl
	serials/subscription-add.pl
	serials/subscription-bib-search.pl
	serials/subscription-detail.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:46 -04:00
Colin Campbell
255362e3cf Fix FSF Address in directory serials/
Add License statement to those files lacking it
2010-04-08 20:39:49 +01:00
Colin Campbell
ad3594fded Bug 4380 Use syspref to resolve which bib display is used
Be consistent with elsewhere in cataloguing
When switching there from serials

TODO Duplicates Code Should be in a common routine
2010-04-08 20:09:02 +01:00
Henri-Damien LAURENT
27460a7ab4 Follow up : MT1902
aaa8d0c80c
This fixes the loop with dates with was using implicit variable
2009-11-11 16:53:28 +01:00
Henri-Damien LAURENT
72d91ac361 Adding a warning On subscription deletion for item
If we really wanted to delete all items linked to a subscription when we delete a subscription
we should change the database structure as such :
ALTER TABLE serialitems ADD FOREIGN KEY ( itemnumber ) REFERENCES items (itemnumber) ON DELETE CASCADE ;
ALTER TABLE serial CHANGE subscriptionid subscriptionid INT( 11 ) NOT NULL
ALTER TABLE serial ADD INDEX subscription ( subscriptionid )
ALTER TABLE serial ADD FOREIGN KEY ( subscriptionid ) REFERENCES subscription (subscriptionid) ON DELETE CASCADE ;
2009-11-11 15:19:24 +01:00
Paul Poulain
21c3169795 removing warnings 2009-11-11 11:17:48 +01:00
Matthias Meusburger
aaa8d0c80c MT 1902, Follow-up 2009-09-30 11:30:41 +02:00
Henri-Damien LAURENT
837ce4a0d7 Adding enddate to Subscriptions
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-30 11:29:24 +02:00
Colin Campbell
bfad238475 Ensure op is defined in serials scripts
Set $op to an empty string if no value passed
otherwise the error-log fills with warnings on comparison
2009-09-16 07:20:08 -04:00
Colin Campbell
c9f3ede161 Enable warnings in serial scripts
Remove some superfluous variables
Simplify some loops over lists
Fix generated warnings
Strip whitespace from line endings

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-14 21:26:11 -04:00
Paul Poulain
6924e7d6b4 fix for 2997 : superlibrarian's ability to edit item/patron home branch affected if all other privileges are selected
Before this patch, we used to test for flags == 1, which was wrong when patron had all privileges.
This patch just adds a %2 to check that patron has superlibrarian privilege, and maybe something else we don't care.

I think I fixed it everywhere except in acquisition, that will be addressed by BibLibre new acquisition module.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-28 17:06:46 -05:00
Galen Charlton
b8fe6d7a1b bug 1433: use same bib when adding new subscription from details page
When viewing the subscription details page of a bib that already
has at least one subscription, clicking on the 'New Subscription'
button in the toolbar will fill in the biblionumber and title
in the new subscription form.

Clicking on the 'New Subscription' button in other context (e.g.,
when viewing the results of a search) will leave the biblionumber
and title fields unpopulated, as there is no specific bib to
use.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-08-06 10:15:16 -05:00
Ryan Higgins
0c66ac6702 Final patch for serials planning bugs
This patch resolves bug 1580 and addresses the modification of firstacquidate as per hdl's comments.
I have also removed some useless javascript from subscription-detail, and just reported the number of
irregular issues there (previously  was reporting nothing since the js was broken).

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-08-05 07:31:24 -05:00
Paul POULAIN
e30d1d6844 bugfix : independantbranches behaviour
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-10 02:55:50 -05:00
Paul POULAIN
fa4cead909 reintroducing history manual modification feature
The history start date and enddate is also useful to modify manually for the same reason : your serial collection may be older than your Koha serial management.

This commit reintroduce the feature.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-10 02:52:52 -05:00
Ryan Higgins
d7821250aa Some templating for serials.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-08 11:11:46 -06:00
Mason James
2b16d7a083 padding Add_Delta_Days date, again.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 00:32:51 -06:00
Joshua Ferraro
a602c6d6eb cleanup for serials and members for Dates 2007-12-04 19:03:35 -06:00
Joe Atzberger
a5746c616a serials subdir - Dates.pm integration and warnings fixes.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-04 18:21:07 -06:00
Mason James
a62811200a bug 1566, enddate not showing.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-13 12:46:48 -06:00
Henri-Damien LAURENT
4399daf0bd Managing Independant branches.
librarian can edit only subscriptions on branches of his or subscription with no branch now.
cannotedit is a calculated value in Mysql and transfered for process.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-04 16:27:25 -06:00
Paul POULAIN
09d6d9f583 bug IPT176 :Once more.
Conflicts:

	koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl

Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-24 15:29:21 -05:00
Henri-Damien LAURENT
054d2b0d19 Deleting Date::Manip
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-20 15:16:22 -05:00
hdl
e3791f5966 Bug Fixing
Getting back to serials-collection when edit finished.
subscription-renew is done in a popup.
2007-07-16 15:49:14 +00:00
hdl
100e6a9808 functions that were in C4::Interface::CGI::Output are now in C4::Output.
So this implies quite a change for files.
Sorry about conflicts which will be caused.
directory Interface::CGI should now be dropped.
I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip.
2007-04-24 13:54:28 +00:00
tipaul
fc1342f73d rel_3_0 moved to HEAD 2007-03-09 15:12:54 +00:00
tgarip1957
da68b830cb Savannah seems out of synch.Code cleaning removal of Date::Manip 2006-11-15 01:38:26 +00:00
tgarip1957
7e52a5665c Clean up before final commits 2006-09-06 16:21:03 +00:00
toins
abf523e751 POD added. 2006-07-12 16:41:35 +00:00
toins
2a7f9b3cdb Sub renamed and/or GPL Licence added according to the coding guideline. 2006-07-07 09:05:23 +00:00
tipaul
247e04d204 templating serials & moving them to a serials directory, more self-explanatory (bull being french) 2006-01-19 12:46:58 +00:00