[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/Auth.pm circ/circulation.pl koha-tmpl/i... [rel_3_0]
|
From: |
LAURIN arnaud |
|
Subject: |
[Koha-cvs] koha C4/Auth.pm circ/circulation.pl koha-tmpl/i... [rel_3_0] |
|
Date: |
Fri, 24 Nov 2006 11:07:09 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: LAURIN arnaud <alaurin> 06/11/24 11:07:09
Modified files:
C4 : Auth.pm
circ : circulation.pl
koha-tmpl/intranet-tmpl/prog/en/circ: circulation.tmpl
koha-tmpl/intranet-tmpl/prog/en/includes: menus.inc
updater : updatedatabase
Log message:
bug sanop #74 :
Add a new system prefence "AutoLocation"
this fonction switching activation or not Autolocation, if Yes, the
Librarian can't change his location, it's defined by branchip,
if autolocation is setting to "NO", librarian can change his settings
....
warn, if autolocation is setting "on", on circulation.pl we don't have
anymore the choice to change your library and branchprinter,
defined on branches : branchip and branchprinter ....
this function could be improved
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.54.2.12&r2=1.54.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.97.2.8&r2=1.97.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.10&r2=1.6.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.17&r2=1.6.2.18
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=rel_3_0&r1=1.157.2.26&r2=1.157.2.27
Patches:
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.12
retrieving revision 1.54.2.13
diff -u -b -r1.54.2.12 -r1.54.2.13
--- C4/Auth.pm 22 Nov 2006 15:47:30 -0000 1.54.2.12
+++ C4/Auth.pm 24 Nov 2006 11:07:08 -0000 1.54.2.13
@@ -36,7 +36,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.54.2.12 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.54.2.13 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -227,11 +227,9 @@
TemplateEncoding => C4::Context->preference("TemplateEncoding"),
AmazonContent => C4::Context->preference("AmazonContent"),
LibraryName => C4::Context->preference("LibraryName"),
- branchname => C4::Context->userenv
- ? C4::Context->userenv->{"branchname"}
- : "",
+ branchname => C4::Context->userenv->{"branchname"},
+ AutoLocation => C4::Context->preference("AutoLocation"),
);
-
}
else {
warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]"
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.97.2.8
retrieving revision 1.97.2.9
diff -u -b -r1.97.2.8 -r1.97.2.9
--- circ/circulation.pl 20 Nov 2006 11:35:37 -0000 1.97.2.8
+++ circ/circulation.pl 24 Nov 2006 11:07:09 -0000 1.97.2.9
@@ -72,6 +72,14 @@
my $branch = C4::Context->userenv->{'branch'};
my $printer = C4::Context->userenv->{'branchprinter'};
+# If Autolocated is not activated, we show the Circulation Parameters to chage
settings of librarian
+ if (C4::Context->preference("AutoLocation") ne 1)
+ {
+ $template->param(
+ ManualLocation => 1,
+ );
+ }
+
my $barcode = $query->param('barcode') || '';
my $year = $query->param('year');
my $month = $query->param('month');
Index: koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.10
retrieving revision 1.6.2.11
diff -u -b -r1.6.2.10 -r1.6.2.11
--- koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl 17 Nov 2006
14:57:22 -0000 1.6.2.10
+++ koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl 24 Nov 2006
11:07:09 -0000 1.6.2.11
@@ -12,13 +12,17 @@
<!-- INITIAL BLOC : PARAMETERS & BORROWER INFO -->
<fieldset>
+<!-- TMPL_IF NAME="ManualLocation" -->
<legend>Circulation Parameters</legend>
<ul>
<li>Branch: <!-- TMPL_VAR NAME="branchname" --></li>
- <!-- TMPL_IF name="printername" --><li>Printer: <!-- TMPL_VAR
NAME="printername" --></li><!-- /TMPL_IF -->
- <li><a href="selectbranchprinter.pl">Change Settings</a></li>
+ <!-- TMPL_IF name="printername" -->
+ <li>Printer: <!-- TMPL_VAR NAME="printername" --></li>
+ <!-- /TMPL_IF -->
+ <li> <a href="selectbranchprinter.pl">Change Settings</a> </li>
</ul>
</fieldset>
+<!-- /TMPL_IF -->
<!-- RESULT OF ISSUING REQUEST -->
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.6.2.17
retrieving revision 1.6.2.18
diff -u -b -r1.6.2.17 -r1.6.2.18
--- koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc 22 Nov 2006 17:33:04
-0000 1.6.2.17
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc 24 Nov 2006 11:07:09
-0000 1.6.2.18
@@ -72,11 +72,21 @@
<li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="loggedinusername" -->
- <li>Logged in as: <!-- TMPL_VAR NAME="loggedinusername" -->
- <br /> From <!-- TMPL_VAR NAME="branchname"-->
- </li>
+ <br>
+ <li> <b> Librarian Informations </b> : </li>
+ <ul>
+ <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b> </li>
+ <li> Library : <b><!-- TMPL_VAR NAME="branchname" --></b> </li>
+ <!-- TMPL_IF NAME="AutoLocation" -->
+ <li>autolocate activated</li>
+ <!-- TMPL_ELSE -->
+ <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Change
Settings</a></li>
+ <!-- /TMPL_ELSE -->
+
+ <!-- /TMPL_IF -->
+ </ul>
+
<ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log
Out</a></li></ul>
- </li>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="IntranetNav" --><!-- TMPL_VAR NAME="IntranetNav"
--><!-- /TMPL_IF -->
</div>
Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.157.2.26
retrieving revision 1.157.2.27
diff -u -b -r1.157.2.26 -r1.157.2.27
--- updater/updatedatabase 23 Nov 2006 11:01:06 -0000 1.157.2.26
+++ updater/updatedatabase 24 Nov 2006 11:07:09 -0000 1.157.2.27
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: updatedatabase,v 1.157.2.26 2006/11/23 11:01:06 toins Exp $
+# $Id: updatedatabase,v 1.157.2.27 2006/11/24 11:07:09 alaurin Exp $
# Database Updater
# This script checks for required updates to the database.
@@ -353,6 +353,15 @@
explanation => 'The includes directory you want for
specific look of Koha (includes or includes_npl for example)',
type => 'Free',
},
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'AutoLocation',
+ value => '0',
+ forceupdate => { 'explanation' => 1,
+ 'type' => 1},
+ explanation => 'switch to activate or not Autolocation, if
Yes, the Librarian can\'t change his location, it\'s defined by branchip',
+ type => 'YesNo',
+ },
],
userflags => [
{
@@ -1992,6 +2001,19 @@
exit;
# $Log: updatedatabase,v $
+# Revision 1.157.2.27 2006/11/24 11:07:09 alaurin
+# bug sanop #74 :
+#
+# Add a new system prefence "AutoLocation"
+# this fonction switching activation or not Autolocation, if Yes, the
Librarian can't change his location, it's defined by branchip,
+# if autolocation is setting to "NO", librarian can change his settings ....
+#
+#
+# warn, if autolocation is setting "on", on circulation.pl we don't have
anymore the choice to change your library and branchprinter,
+# defined on branches : branchip and branchprinter ....
+#
+# this function could be improved
+#
# Revision 1.157.2.26 2006/11/23 11:01:06 toins
# branchtransfers.frombranch & branchtransfers.tobranch must be VARCHAR(10)
#
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha C4/Auth.pm circ/circulation.pl koha-tmpl/i... [rel_3_0],
LAURIN arnaud <=