Merge remote branch 'kc/new/bug_5186' into kcmaster

[koha_fer] / opac / opac-suggestions.pl

diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
index cd512de..75d0791 100755 (executable)
--- a/opac/opac-suggestions.pl
+++ b/opac/opac-suggestions.pl
@@ -35,7 +35,8 @@ delete $$suggestion{$_} foreach qw<op suggestedbyme>;
 $op = 'else' unless $op;
 
 my ( $template, $borrowernumber, $cookie );
-
+my $deleted = $input->param('deleted');
+my $submitted = $input->param('submitted');
 
 if ( C4::Context->preference("AnonSuggestions") ) {
     ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -66,16 +67,16 @@ if ($allsuggestions){
 else {
        $$suggestion{suggestedby} ||= $borrowernumber unless ($allsuggestions);
 }
-warn "bornum:",$borrowernumber;
-use YAML;
+# warn "bornum:",$borrowernumber;
+
 my $suggestions_loop =
   &SearchSuggestion( $suggestion);
 if ( $op eq "add_confirm" ) {
        if (@$suggestions_loop>=1){
-               #some suggestion are answering the request Donot Add    
-       } 
+               #some suggestion are answering the request Donot Add
+       }
        else {
-               $$suggestion{'suggestioncreatedon'}=C4::Dates->today;
+               $$suggestion{'suggesteddate'}=C4::Dates->today;
                $$suggestion{'branchcode'}=C4::Context->userenv->{"branch"};
                &NewSuggestion($suggestion);
                # empty fields, to avoid filter in "SearchSuggestion"
@@ -84,6 +85,8 @@ if ( $op eq "add_confirm" ) {
                   &SearchSuggestion( $suggestion );
        }
        $op              = 'else';
+    print $input->redirect("/cgi-bin/koha/opac-suggestions.pl?op=else&submitted=1");
+    exit;
 }
 
 if ( $op eq "delete_confirm" ) {
@@ -92,24 +95,41 @@ if ( $op eq "delete_confirm" ) {
         &DelSuggestion( $borrowernumber, $delete_field );
     }
     $op = 'else';
+    print $input->redirect("/cgi-bin/koha/opac-suggestions.pl?op=else&deleted=1");
+    exit;
 }
-map{ $_->{'branchcodesuggestedby'}=GetBranchInfo($_->{'branchcodesuggestedby'})->[0]->{'branchname'}} @$suggestions_loop;  
-my $supportlist=GetSupportList();                              
+map{ $_->{'branchcodesuggestedby'}=GetBranchInfo($_->{'branchcodesuggestedby'})->[0]->{'branchname'}} @$suggestions_loop;
+my $supportlist=GetSupportList();
 foreach my $support(@$supportlist){
        if ($$support{'imageurl'}){
-               $$support{'imageurl'}= getitemtypeimagelocation( 'intranet', $$support{'imageurl'} );
+               $$support{'imageurl'}= getitemtypeimagelocation( 'opac', $$support{'imageurl'} );
        }
        else {
           delete $$support{'imageurl'}
        }
 }
+
+foreach my $suggestion(@$suggestions_loop) {
+    if($suggestion->{'suggestedby'} == $borrowernumber) {
+        $suggestion->{'showcheckbox'} = $borrowernumber;
+    } else {
+        $suggestion->{'showcheckbox'} = 0;
+    }
+    if($suggestion->{'patronreason'}){
+        $suggestion->{'patronreason'} = GetKohaAuthorisedValueLib("OPAC_SUG",$suggestion->{'patronreason'},1);
+    }
+}
+
+my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
+
 $template->param(
        %$suggestion,
        itemtypeloop=> $supportlist,
     suggestions_loop => $suggestions_loop,
+    patron_reason_loop => $patron_reason_loop,
     showall    => $allsuggestions,
     "op_$op"         => 1,
-         suggestionsview => 1
+    suggestionsview => 1,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;