authorities (continued)

diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 391a42e..d189d49 100755 (executable)
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -336,7 +336,7 @@ if ($op eq "add") {
 # MARC::Record built => now, record in DB
        warn "IN ADD : ".$record->as_formatted();
        if ($is_a_modif) {
-                AUTHmodauthority($dbh,$record,$authid,$authtypecode);
+                AUTHmodauthority($dbh,$authid,$record,$authtypecode);
        } else {
                ($authid) = AUTHaddauthority($dbh,$record,$authid,$authtypecode);
        }
@@ -419,7 +419,6 @@ foreach my $thisauthtype (keys %$authtypes) {
                                selected => $selected,
                                authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
                        );
-       warn "X = $authtypes->{$thisauthtype}{'authtypetext'}";
        push @authtypesloop, \%row;
 }
 

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl
index c56a3e9..2b0cf44 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl
@@ -8,10 +8,11 @@
                <input type="hidden" name="op" value="add">
                <input type="hidden" name="addfield_field">
                <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
+               <input type="hidden" name="authid" value="<!-- TMPL_VAR name="authid" -->">
                <!-- TMPL_IF name="authid" -->
                        <input type="button" value="Save" onClick='Check(this.form)' accesskey="w" class="button authority">
                <!-- TMPL_ELSE -->
-                       <input type="button" value="Add biblio" onClick='Check(this.form)' accesskey="w" class="button authority">
+                       <input type="button" value="Add authority" onClick='Check(this.form)' accesskey="w" class="button authority">
                <!-- /TMPL_IF -->
 <!--           <a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
        </p>

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
index a3a937e..3444187 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
@@ -30,13 +30,27 @@
        <div id="resultlist">
                <table>
                        <tr>
-                               <th class="authority">Authority #</th>
-                               <th class="authority">Author</th>
+                               <th class="authority">Summary</th>
+                               <th class="authority">Used</th>
+                               <th class="authority">View</th>
+                               <th class="authority">Delete</th>
                        </tr>
                        <!-- TMPL_LOOP name="result" -->
                                <tr>
-                                       <td><a href="detail.pl?authid=<!-- TMPL_VAR name="authid" -->"><!-- TMPL_VAR name="authid" --></a></td>
                                        <td><!-- TMPL_VAR name="summary" --></td>
+                                       <td><!-- TMPL_VAR name="used" --> <a href="../search.marc/search.pl?type=intranet&op=do_search&marclist=<!-- TMPL_VAR name="biblio_fields" -->&operator==&value=<!-- TMPL_VAR name="authid" -->&and_or=&excluding=">...</a></td>
+                                       <td>
+                                               <a href="detail.pl?authid=<!-- TMPL_VAR name="authid" -->">
+                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" alt="Authority number <!-- TMPL_VAR name="authid" -->" title="Authority number<!-- TMPL_VAR name="authid" -->">
+                                               </a>
+                                       </td>
+                                       <td>
+                                               <!-- TMPL_UNLESS name="used" -->
+                                               <a href="authorities-home.pl?op=delete&authid=<!-- TMPL_VAR name="authid" -->">
+                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
+                                               </a>
+                                               <!-- /TMPL_UNLESS -->
+                                       </td>
                                </tr>
                        <!-- /TMPL_LOOP -->
                </table>