View | Details | Raw Unified | Return to bug 7493
Collapse All | Expand All

(-)a/installer/data/mysql/kohastructure.sql (-1 / +3 lines)
Lines 1616-1622 CREATE TABLE `reviews` ( -- patron opac comments Link Here
1616
  `review` text, -- the body of the comment
1616
  `review` text, -- the body of the comment
1617
  `approved` tinyint(4) default NULL, -- whether this comment has been approved by a librarian (1 for yes, 0 for no)
1617
  `approved` tinyint(4) default NULL, -- whether this comment has been approved by a librarian (1 for yes, 0 for no)
1618
  `datereviewed` datetime default NULL, -- the date the comment was left
1618
  `datereviewed` datetime default NULL, -- the date the comment was left
1619
  PRIMARY KEY  (`reviewid`)
1619
  PRIMARY KEY  (`reviewid`),
1620
  CONSTRAINT `reviews_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE,
1621
  CONSTRAINT `reviews_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE
1620
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1622
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1621
1623
1622
--
1624
--
(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
Lines 4734-4739 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
4734
    SetVersion($DBversion);
4734
    SetVersion($DBversion);
4735
}
4735
}
4736
4736
4737
$DBversion = "3.07.00.XXX";
4738
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
4739
    $dbh->do("DELETE FROM reviews WHERE biblionumber NOT IN (SELECT biblionumber from biblio)");
4740
    $dbh->do("UPDATE reviews SET borrowernumber = NULL WHERE borrowernumber NOT IN (SELECT borrowernumber FROM borrowers)");
4741
    $dbh->do("ALTER TABLE reviews ADD CONSTRAINT reviews_ibfk_2 FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE");
4742
    $dbh->do("ALTER TABLE reviews ADD CONSTRAINT reviews_ibfk_1 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber ) ON UPDATE CASCADE ON DELETE SET NULL");
4743
    print "Upgrade to $DBversion done (Bug 7493 - Add constraint linking OPAC comment biblionumber to biblio, OPAC comment borrowernumber to borrowers.)\n";
4744
    SetVersion($DBversion);
4745
}
4746
4737
=head1 FUNCTIONS
4747
=head1 FUNCTIONS
4738
4748
4739
=head2 DropAllForeignKeys($table)
4749
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-1 / +1 lines)
Lines 44-50 Link Here
44
    <tbody>[% FOREACH review IN reviews %]
44
    <tbody>[% FOREACH review IN reviews %]
45
    <tr>
45
    <tr>
46
        <td>
46
        <td>
47
            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber %]">[% review.surname %], [% review.firstname %]</a>
47
            [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber %]">[% review.surname %], [% review.firstname %]</a>[% ELSE %](deleted patron)[% END %]
48
        </td>
48
        </td>
49
        <td>
49
        <td>
50
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a>
50
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt (-1 / +1 lines)
Lines 26-32 Link Here
26
                        [% IF ( review.notes ) %], [% review.notes |html %][% END %]
26
                        [% IF ( review.notes ) %], [% review.notes |html %][% END %]
27
                        [% IF ( review.size ) %] [% review.size |html %]. [% END %]
27
                        [% IF ( review.size ) %] [% review.size |html %]. [% END %]
28
                        [% IF ( review.isbn ) %] [% review.isbn |html %][% END %] </p>
28
                        [% IF ( review.isbn ) %] [% review.isbn |html %][% END %] </p>
29
<p>[% review.firstname %] [% review.surname %] commented on [% review.datereviewed %]: [% review.review |html %]</p>
29
<p>[% IF ( review.borrowernumber && ShowReviewer ) %][% review.firstname %] [% review.surname %] commented[% ELSE %]Comment[% END %] on [% review.datereviewed %]: [% review.review |html %]</p>
30
						]]></description>
30
						]]></description>
31
       <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]&amp;reviewid=[% review.reviewid %]</guid>
31
       <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]&amp;reviewid=[% review.reviewid %]</guid>
32
       <pubDate>[% review.timestamp %]</pubDate>
32
       <pubDate>[% review.timestamp %]</pubDate>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt (-2 / +1 lines)
Lines 54-60 $(document).ready(function(){ Link Here
54
            [% review.review |html %]
54
            [% review.review |html %]
55
            [% END %]
55
            [% END %]
56
            <span style="font-size:87%;font-color:#CCC;">Added [% review.datereviewed %] [% IF ( review.your_comment ) %] by <strong>you</strong>[% ELSE %]
56
            <span style="font-size:87%;font-color:#CCC;">Added [% review.datereviewed %] [% IF ( review.your_comment ) %] by <strong>you</strong>[% ELSE %]
57
            [% IF ( ShowReviewer != "none" ) %] by
57
            [% IF ( review.borrowernumber && ShowReviewer != "none" ) %] by
58
                [% SWITCH ShowReviewer %]
58
                [% SWITCH ShowReviewer %]
59
                [% CASE 'full' %]
59
                [% CASE 'full' %]
60
                    [% review.borrtitle %] [% review.firstname %] [% review.surname %]
60
                    [% review.borrtitle %] [% review.firstname %] [% review.surname %]
61
- 

Return to bug 7493