Commit graph

16391 commits

Author SHA1 Message Date
Paul Poulain
a598b10061 Merge remote-tracking branch 'origin/new/bug_7178' 2012-05-14 16:18:46 +02:00
d83596ad1b Followup 7178: Remove warning on uninitialized value in sprintf for neworderempty
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 16:17:05 +02:00
Julian Maurice
7a81b89357 Bug 7178: Follow-up Improve order item creation
Move SQL code from Perl script to Perl module
Replace SHOW COLUMNS by $dbh->column_info()
Update total on neworderempty.pl when adding or deleting items

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested ok for ordering and receiving items.
Total updated correctly.

Note: There are lots of errors in the logs before and after applying
the patch. A follow up is needed.
2012-05-14 16:16:13 +02:00
Jared Camins-Esakov
9295e47a66 Bug 7998: Don't make the news all bold
Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 16:07:58 +02:00
Liz Rea
42a38e4a2a Bug 7998 - CSS fixes for new interface
Omnibus of changes thus far:

adds slight transparency for news so logo shows through on mainpage..
Fixes purple header gradient in Chrome-based browsers.
remove list from returns.tt options so checkboxes do not have bullets.
fix missing gradient class on returns.tt.
reverse colors of menu div - blue for inactive, grey for active.

turns searchheader blue, rounds corners, improves spacing for sort form.

Adds padding, rounded corners, and a 1px border to the now-blue toolbar.

increase width of intranet nav div to width 40%

add a bit of padding to #searchheader

fieldset.action changes - removed background, added a little padding to make it look better in all of the uses I could find of it.

Bug 7998 - followup - make facets header background blue

bug 7998 - followup - fixing headers on search.pl to be blue, rounded.

bug 7998 - followup - consistency tweaks

match menu borders to the search header tabs (green border)
hover menus a very light grey instead of #eee.
make fieldset.brief have a consistent border with the rest of the fieldsets.

bug 7998 - followup - more tabs/borders updating to fit in new look

boraccount.pl

bug 7998 - followup - add gradient div to prefs-admin-search.inc

Bug 7998 - Change toolbar to be lighter, with barely discernible border

Will need to be applied after the other patch.

Bug 7998 - add gradient to roadtype admin panel

Bug 7998 - adds gradient to patrons-admin-search.tt

Bug 7998 - add gradient to budgets-admin-search.inc

bug 7998 - add gradient to z3950-admin-search.inc

Bug 7998 - add gradient to cities-admin-search.inc

bug 7998 - active tab on checkout table now has green border like side menu

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-05-14 16:07:11 +02:00
Paul Poulain
9ec7ac5b8e Merge remote-tracking branch 'origin/new/bug_5345' 2012-05-14 15:42:47 +02:00
Jonathan Druart
4df6ccacf1 Bug 5345: DataTables integration in acquisition module [6]
histsearch.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 15:42:06 +02:00
Jonathan Druart
d89396d3d7 Bug 5345: DataTables integration in acquisition module [10]
ordered.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-05-14 15:41:58 +02:00
Jonathan Druart
8231df1a42 Bug 5345: DataTables integration in acquisition module [13]
spent.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-05-14 15:41:57 +02:00
Jonathan Druart
8db20c6abd Bug 5345: DataTables integration in acquisition module [15]
uncertainprice.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-05-14 15:41:52 +02:00
Jonathan Druart
b7f6714544 Bug 5345: DataTables integration in acquisition module [9]
newordersuggestion.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-05-14 15:41:44 +02:00
Srdjan
df98c8aaaa bug_7647: Table sorter on issue history
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 15:39:44 +02:00
Magnus Enger
0808da6de2 Bug 7982: [SIGNED-OFF] Typo in moremember-receipt.tt
Changes "Checked uut today" to "Checked out today".

To test:
Um, just looking at the patch should be enough, I think?

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 15:29:38 +02:00
Jared Camins-Esakov
d23b5920ac Bug 8022: Permissions test doesn't check all languages
Add the permissions files for es-ES and nb-NO to the permissions test.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Running xt/permissions.t before the patch leaves out nb-NO and es-ES.
After the patch they are picked up and the test fails correctly
because of the missing permissions described in Bug 7984.
As far as I can tall, all permission files are now picked up by
this test.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 15:05:16 +02:00
Adrien Saurat
f1b3f46de5 Bug 8045: fixes "date due" when checking in
Added cloning of object parameters in "days_between" method.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Checked in items that were overdue, due in the future and not
checked out and all showed the right info in the check in
table.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 14:54:03 +02:00
Magnus Enger
e8ad24ca78 Bug 7984 [SIGNED-OFF] - Fix the upload_local_cover_images permission
upload_local_cover_images is needed to use the new, cool local covers
feature

This patch
- adds upload_local_cover_images to
  installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
  from whch it was missing, making it impossible to use the local
  covers feature in an nb-NO installation
- translates the text of the preference for de-DE (thanks to cait,
  drojf and mveron for the translation)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Marc Veron <veron@veron.ch>

I did no fresh installs, however I
- had a look at the files before and after applying the patch
- carefully checked the syntax
- tested with MySQL by removing the entry in the table 'permissions'
  double checked that now the entry in Staff client was one
  and then did  an insert with the sql snippets.
  In DE-de the translated entry translation appeared as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 14:47:35 +02:00
Magnus Enger
491a00f0a2 Bug 7924 - Fix handling of command line arguments in koha-remove
koha-remove would fail with a message like this:
Removing Koha instance --
ERROR 1396 (HY000) at line 1: Operation DROP USER failed for 'koha_--'@'%'

After fixing this, the --keep-mysql option made the script exit without doing
anything.

To test:

Alt 1
- Build package with build-git-snapshot
- Install package

Alt 2
- Replicate the changes in the patch in an existing installation

Then:
- Add instance1 and instance2
- koha-remove instance1
-- Check that script completes and the databse is gone
- koha-remove --keep-mysql instance2
-- Check that the script completes but the database is not removed

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 14:01:22 +02:00
9a309b61bd Bug 8035 - bibs with comments show an error in opac
If a record has any approved comments, viewing the record
details in the opac will error out with the following
message:

Undefined subroutine &main::format_date called at
/home/load02/kohaclone/opac/opac-detail.pl line 654.

This is caused by a use of C4::Dates::format_date
without adding a use call to the head of the file.

Removing the call is the only change necessary. The
dates are already being filtered by $KohaDates.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 13:58:49 +02:00
Chris Cormack
e9faa58901 Bug 8072: [SIGNED-OFF] Changes in capitalisation had broken guided reports
signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 13:56:50 +02:00
aee340a627 Bug 7877 - note on expiration in the opac worded wrongish
Correction following Nicole's suggestion.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 12:24:09 +02:00
f2842869bb Bug 7842 - Inconsistencies in Notices interface
- Putting "New" button in toolbar <div>
- Moving "Copy" function and making label more explicit
- Adding page headings
- Correcting table header sort options

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 12:22:09 +02:00
Paul Poulain
1aebf5594b Bug 7739 follow-up for capital cases 2012-05-11 12:20:14 +02:00
Amit Gupta
fcc9fcea4f Bug 7739 - Batch edit items of a title
A new option - Edit items in batch - is made available under the menu - Edit - in the catalog detail page. When this option is selected the tool batch item modification is called with all items under this biblio passed as parameters.

User can then edit all items of this biblio in batch. Once changes are saved the "done" link takes the user back to the catalog detail page of this biblio.

To test:
    Navigate to catalog detail page of any biblio with one or more item records. Use the option "Edit items in batch" from the "Edit" menu. Modify the items in batch, say the collction code or lost status. Press "Save", verify that changes have been effected in the confirmation screen. Use the "Done" link to navigate back to the catalog detail page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 12:16:22 +02:00
db32e098d4 Bug 8048 - better spacing on categories for attributes
- Convert <h4> to <caption> and adding comfortable padding.
 - Add quotes to attribute for validity
 - Add padding to patron messaging note too since it has
   the same problem.

To test you must have at least one value added to the PA_CLASS
authorised value category. At least one patron attribute must
be categorized using that value.

On the patron edit screen that patron attribute category should
display with comfortable padding.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Looks much better!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:37:12 +02:00
Paul Poulain
e584ba169e Merge remote-tracking branch 'origin/new/bug_5345' 2012-05-11 11:33:51 +02:00
Jonathan Druart
53b5d0449b Bug 5345: DataTables integration in acquisition module [16]
z3950_search.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-05-11 11:32:48 +02:00
Paul Poulain
a647546b57 Welcoming Lyon 3 team as a committer, and adding 3.8.0 release
Also fixing 3 space/tab mistakes
2012-05-11 11:28:25 +02:00
Lyon3 Team
81f63a4d5d Replace itemnumber by barcode in links of patron modification log
in the ISSUE and RETURN links to item

http://bugs.koha-community.org/show_bug.cgi?id=7870
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Passes tests, works as expected. Perhaps for followup - items that have been deleted are linked, but do not work. If an itemnumber doesn't exist, it should not be linked.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:24:57 +02:00
Paul Poulain
45c08ebd5d Merge remote-tracking branch 'origin/new/bug_5184' 2012-05-11 11:23:55 +02:00
806798dc66 Bug 5184 [REVISED] Upgrade jQuery to the latest version (OPAC)
Upgrade jQuery in the OPAC.

To test: Try any JavaScript-dependent interaction
you can think of in the OPAC and watch for errors.

Revision updates the one syntax I've found so far in testing
which requires an update. Where we used to do this to
uncheck a checkbox:

$(foo).attr("checked","");

We should now use:

$(foo).removeAttr("checked");

As far as I can tell the old way will not generate an error
but neither will it work.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
2012-05-11 11:22:41 +02:00
Colin Campbell
78938e685c Bug 6335 Set branch in sip session
The server returns its branch as the institution in the config file
However in transactions it will default to the homebranch of the
sip user which may not be consistent with that. Needs to set branch
in the session if there is a value in config otherwise statistics and
behaviour can be wrong (esp in discharge)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:15:06 +02:00
Jonathan Druart
18f21b32c6 Bug 7820: Followup: Add missing Debian packages
Adds DateTime::Set used in Koha/Calendar.pm

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:13:16 +02:00
Ian Walls
4bce2d426d Bug 7820: Add missing Debian packages
Adds DateTime::Format::DateParse, Readonly, Readonly::XS and Modern::Perl
Debian packages to install_misc/debian.packages

Signed-off-by: Marc Balmer <marc@msys.ch>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>

Sign off for Marc Balmer added manually by Ian Walls on Mar 24, 2012 by
permission (see IRC chat log)
2012-05-11 11:13:14 +02:00
d1e3773e3b Bug 5184 - Upgrade jQuery to the latest version (staff client)
Upgrade jQuery in the staff client. Besides the change
to the jQuery file syntax has been changed wherever this
syntax was written:

$(foo).attr("checked","");

The new correct way to un-check a checkbox:

$(foo).removeAttr("checked");

I also removed some JavaScript altogether from
branch-transfer-limits.tt which used the old syntax but
which wasn't used on the page at all anymore.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:05:19 +02:00
Paul Poulain
c6337e7ea5 Bug 7249 BDRev number 2012-05-11 10:58:43 +02:00
Paul Poulain
b80c50d98c bug 7249 follow-up, online help 2012-05-11 10:58:33 +02:00
Jared Camins-Esakov
02a6d2b1d0 Bug 7249: Syspref to control number of rows in web service results
The original patches for bug 7249 had a hardcoded limit of ten rows in the
results returned by the web service. This patch adds a SvcMaxReportRows syspref
which allows the librarian to choose how many rows should be returned by the
web service.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 10:26:33 +02:00
Chris Hall
24213703d5 Bug 7249 : Allow reports to be called through a restful interface
Hands back JSON, and supports caching

Squashed commit of the following:

commit 5c93506079738b9a13139417d3a0734289a4b007
Author: Chris Hall <chrish@catalyst.net.nz>
Date:   Mon Nov 21 15:41:14 2011 +1300

    Fixed bugs when creating reports, added more user friendly input and
    feedback

commit c62430bb358ee4af6ee5331b4d3a2ed67f723032
Author: Chris Hall <chrish@catalyst.net.nz>
Date:   Mon Nov 21 12:00:27 2011 +1300

    Added caching to intranet report webservices, added cache expiry and public
    options to reports

commit 2d89f0777d95b26bf08635782070b6367d0698f3
Author: Chris Cormack <chris@bigballofwax.co.nz>
Date:   Wed Nov 9 20:29:26 2011 +1300

    Working on caching for services

commit e0511f180cebd81747858ad776433fe3a1cf6854
Author: Chris Cormack <chris@bigballofwax.co.nz>
Date:   Wed Nov 9 08:28:26 2011 +1300

    Starting work on webservices

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch includes database update adding 2 new fields to the saved_sql table.

1) Checked that adding/deleting/editing of sql reports still works and new
fields are correctly saved to the database.

2) The saved reports page now lists the new fields correctly.

3) Checking URLs with JSON output
- if report is not public http://localhost/cgi-bin/koha/svc/report?id=2 fails,
but http://localhost:8080/cgi-bin/koha/svc/report?id=2 works
- if report is public, both links work

4) Checking results are cached
Created a report listing my borrowers, setting caching to 60 seconds and
added new borrowers before doing following tests.
- URL doesn't show new borrower immediately - correct
- Turning off the usecache system preference updates data - correct
- Restarting memcached updates data '/etc/init.d/memcached restart' - correct
- Waiting until cache time runs out updates data - correct

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Retested the feature and renewing my sign-off.

There are some things that should be noted:
- currently there is a hardcoded limit of 10 results for the reports webservice
- reports with runtime parameters are currently not supported
2012-05-11 10:26:29 +02:00
46f3fd6e97 Bug 7500 - Use CSS Sprites for faster page loading
This patch moves *most* small interface icons and
the Koha log into a single 10K sprite image. CSS
is used to position the sprite correctly for each
icon instance.

Not covered by this patch: XSLT icons, star ratings
icons, table sort icons (the latter which I don't
think can be done using this technique).

A follow-up patch should remove the individual images
which have been replaced by the sprite.

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-10 18:31:30 +02:00
Paul Poulain
a8c8cc3ca5 Bug 7903 follow-up, wrong capital cases
Also fixing a tiny indentation problem
2012-05-07 23:26:16 +02:00
Lyon3 Team
7a1b608472 Add ordernumber column in orders history table
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

There was a conflict (whitespace changes causing a conflict)

http://bugs.koha-community.org/show_bug.cgi?id=7903
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:21:34 +02:00
Gaetan Boisson
09cdcad460 Bug 7949 - a different favicon for the staff client
different favicon proposal

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:19:56 +02:00
Stéphane Delaune
ab602f9b76 bug 7990 - styl= in aqplan.tt
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:17:33 +02:00
Liz Rea
8eeda3a65c Bug 7953 - add opacuserjs to the sco template
To test:
add some jquery to opacuserjs that would change the screen
a la: $(".checkout label[for='patronid']").css("border","3px solid red");
verify you see a red box on the sco-main page.

Also adds the ability to use opacusercss to style sco-main.tt

to test:
Add some css to opacusercss that would change the screen:
.checkout { background: grey; }
verify you see a grey box around the checkout div.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

http://bugs.koha-community.org/show_bug.cgi?id=7959
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:16:49 +02:00
Magnus Enger
37311cf534 Bug 8008 - Fix typo in man page for koha-create
Line 121 had "/etc/koha/koha-site.conf" instead of "/etc/koha/koha-sites.conf"

To test:
I don't think this needs any actual testing, just read the patch and check
that it looks sensible...

Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:15:47 +02:00
Srdjan
b9f4a8cac6 bug 6372: moved background-job.inc to background-job-progressbar.js
Check for div 0 when calculating percentage

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
div0 no longer appears on 0 size jobs.
Passes t xt

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:00:34 +02:00
Katrin Fischer
aaad410dce Bug 7929 - Duplicate id "availability" on XSLT result page
Changes id="availability" to class="availability" for XHTML valididy
(ids have to be unique on a page).

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 22:52:35 +02:00
Colin Campbell
d78c28db7b Bug 7987 [SIGNED-OFF] Fix typo in circulation template
li was not properly closed after loss of a character

Signed-off-by: Marc Veron <veron@veron.ch>

- Checked koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt before / after applying patch
- Line is changed as expected, ends now with </li>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 22:49:54 +02:00
Katrin Fischer
548b85db85 Bug 2399: Follow up removing MySQLisms from ru-RU and uk-UA sample files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 22:26:57 +02:00
Katrin Fischer
86ae1e2849 Bug 2399: All status fields in the item edit interface offer two blank/null entries per dropdown instead of one
Removes the '0' values without description from the sample date for
authorised values.

To test:
1) Verify that SQL files load correctly
- truncate authorised_values; /* empty authorised values table */
- load sample data using one of the SQL files
2) Check cataloging interface - all status fields should only show 1 empty line

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-07 22:26:53 +02:00