[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.33.2.5,1.33.2.6 moremember.tmpl,1.32.2.5,1.32.2.6 readingrec.tmpl,1.13.2.1,1.13.2.2
Henri-Damien LAURENT
hdl at users.sourceforge.net
Fri Aug 26 14:21:52 CEST 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24682/koha-tmpl/intranet-tmpl/default/en/members
Modified Files:
Tag: rel_2_2
memberentry.tmpl moremember.tmpl readingrec.tmpl
Log Message:
Commiting all that allows Branch Independancy management :
* in acquisition module, an order can be modified/recieved/closed only by a librarian from the same branch than the librarian that created the basket.
* in catalogue module, an item can be modified/deleted/created only by a librarian from the same branch as item owner branch
* in members module, a member can be created/modified only by a librarian from the branch of the member.
Modifying Context.pm :
Adding userenv context variable.
Is set during checkauth or get_template_and_user
Modifying Auth.pm function checkauth : setting userenv context variable
Modifying Acquisition.pm:
* histsearch
* branches
* bookfunds
* getsupplierlistwithlateorders
* getlateorders
* getallorders
* getorders
Add a branch criterium if IndependantBranches is set.
Modifiying Suggestion.pm:
* searchsuggestions Will look first for th Librarian Branch and restrict search to suggestion made by users from this branch
* countsuggestions Will look first for th Librarian Branch and restrict search to suggestion made by users from this branch
File Modifiying :
* admin/aqbudget.pl adding a branch selection for budget.
* parameters/aqbudget.tmpl
* admin/aqbookfund.pl adding a branch selection for bookfund
* parameters/aqookfund.tmpl
And adding branch selection to members and items changes.
WARNING: bibid are still used in additem, unlike in HEAD... Shall be soon fixed.
Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.33.2.5
retrieving revision 1.33.2.6
diff -C2 -r1.33.2.5 -r1.33.2.6
*** memberentry.tmpl 28 Jun 2005 11:51:58 -0000 1.33.2.5
--- memberentry.tmpl 26 Aug 2005 12:21:50 -0000 1.33.2.6
***************
*** 37,40 ****
--- 37,43 ----
Postal city<br>
<!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="ERROR_branch" -->
+ Branch : member should be of the same branch as you<br>
+ <!-- /TMPL_IF -->
</div>
<!-- /TMPL_IF -->
Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.32.2.5
retrieving revision 1.32.2.6
diff -C2 -r1.32.2.5 -r1.32.2.6
*** moremember.tmpl 25 Mar 2005 16:55:39 -0000 1.32.2.5
--- moremember.tmpl 26 Aug 2005 12:21:50 -0000 1.32.2.6
***************
*** 64,82 ****
</p>
<p>
! <!-- TMPL_IF NAME="I" -->
! <a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
! <!-- /TMPL_IF -->
! <a href="javascript:confirm_deletion()" class="button">Delete</a>
! <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Issue books</a>
! <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Change Password</a>
! </p>
! <br/>
! <p>
! <!-- TMPL_IF NAME="IS_ADULT" -->
! <a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">Add Child</a>
! <!-- /TMPL_IF -->
! <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify User Flags</a>
<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&print=page" class="button">Print Page</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&print=slip" class="button">Print Slip</a>
</p>
--- 64,84 ----
</p>
<p>
! <!-- TMPL_UNLESS NAME="unvalidlibrarian"-->
! <!-- TMPL_IF NAME="I" -->
! <a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
! <!-- /TMPL_IF -->
! <a href="javascript:confirm_deletion()" class="button">Delete</a>
! <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Issue books</a>
! <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Change Password</a>
! </p>
! <br/>
! <p>
! <!-- TMPL_IF NAME="IS_ADULT" -->
! <a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">Add Child</a>
! <!-- /TMPL_IF -->
! <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify User Flags</a>
! <!-- /TMPL_UNLESS -->
<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&print=page" class="button">Print Page</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&print=slip" class="button">Print Slip</a>
</p>
***************
*** 100,103 ****
--- 102,106 ----
</TMPL_IF>
<p>
+ <!-- TMPL_UNLESS NAME="unvalidlibrarian"-->
<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
View Account
***************
*** 106,109 ****
--- 109,113 ----
Pay Fines
</a>
+ <!-- /TMPL_UNLESS -->
</p>
</div>
***************
*** 140,146 ****
<tr>
<td colspan="5" align="right">
! <!-- TMPL_IF NAME="reserveloop" -->
! <input type="submit" name="submit" value="Update" class="button">
! <!-- /TMPL_IF -->
</td>
</tr>
--- 144,152 ----
<tr>
<td colspan="5" align="right">
! <!-- TMPL_UNLESS NAME="unvalidlibrarian"-->
! <!-- TMPL_IF NAME="reserveloop" -->
! <input type="submit" name="submit" value="Update" class="button">
! <!-- /TMPL_IF -->
! <!-- /TMPL_UNLESS -->
</td>
</tr>
***************
*** 168,172 ****
<th>Itemtype</th>
<th>Charge</th>
! <th>Renew</th>
</tr>
--- 174,180 ----
<th>Itemtype</th>
<th>Charge</th>
! <!-- TMPL_UNLESS Name ="unvalidlibrarian"-->
! <th>Renew</th>
! <!-- /TMPL_UNLESS -->
</tr>
***************
*** 182,198 ****
<td><!-- TMPL_VAR NAME="itemtype" --></td>
<td><!-- TMPL_VAR NAME="charge" --></td>
! <td>
! <!-- TMPL_IF NAME="norenew" -->
! <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
! <!-- TMPL_ELSE -->
! <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Y
! <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">N
! <!-- /TMPL_IF -->
!
! </td>
</tr>
<!-- /TMPL_LOOP -->
</table>
! <input type="submit" class="button" value="Renew Items">
</form>
<!-- TMPL_ELSE -->
--- 190,209 ----
<td><!-- TMPL_VAR NAME="itemtype" --></td>
<td><!-- TMPL_VAR NAME="charge" --></td>
! <!-- TMPL_UNLESS Name ="unvalidlibrarian"-->
! <td>
! <!-- TMPL_IF NAME="norenew" -->
! <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
! <!-- TMPL_ELSE -->
! <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Y
! <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">N
! <!-- /TMPL_IF -->
! </td>
! <!-- /TMPL_UNLESS -->
</tr>
<!-- /TMPL_LOOP -->
</table>
! <!-- TMPL_UNLESS Name ="unvalidlibrarian"-->
! <input type="submit" class="button" value="Renew Items">
! <!-- /TMPL_UNLESS -->
</form>
<!-- TMPL_ELSE -->
Index: readingrec.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** readingrec.tmpl 11 Feb 2005 14:28:52 -0000 1.13.2.1
--- readingrec.tmpl 26 Aug 2005 12:21:50 -0000 1.13.2.2
***************
*** 13,26 ****
<tr>
<th>
! <a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&order=title&limit=<!-- TMPL_VAR NAME="limit" -->">Title</th>
</th>
<th>
! <a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&order=author&limit=<!-- TMPL_VAR NAME="limit" -->">Author</th>
! </td>
<th>
! <a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&limit=<!-- TMPL_VAR NAME="limit" -->"><th>Date due</th>
</th>
<th>
! <a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&order=returndate&limit=<!-- TMPL_VAR NAME="limit" -->">Returned</th>
</th>
<th>
--- 13,26 ----
<tr>
<th>
! <a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&order=title&limit=<!-- TMPL_VAR NAME="limit" -->">Title</a></th>
</th>
<th>
! <a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&order=author&limit=<!-- TMPL_VAR NAME="limit" -->">Author</a>
! </th>
<th>
! <a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&limit=<!-- TMPL_VAR NAME="limit" -->">Date due</a>
</th>
<th>
! <a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&order=returndate&limit=<!-- TMPL_VAR NAME="limit" -->">Returned</a></th>
</th>
<th>
More information about the Koha-cvs
mailing list