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

(-)a/installer/data/mysql/kohastructure.sql (-1 / +3 lines)
Lines 1598-1604 CREATE TABLE `reviews` ( -- patron opac comments Link Here
1598
  `review` text, -- the body of the comment
1598
  `review` text, -- the body of the comment
1599
  `approved` tinyint(4) default NULL, -- whether this comment has been approved by a librarian (1 for yes, 0 for no)
1599
  `approved` tinyint(4) default NULL, -- whether this comment has been approved by a librarian (1 for yes, 0 for no)
1600
  `datereviewed` datetime default NULL, -- the date the comment was left
1600
  `datereviewed` datetime default NULL, -- the date the comment was left
1601
  PRIMARY KEY  (`reviewid`)
1601
  PRIMARY KEY  (`reviewid`),
1602
  CONSTRAINT `reviews_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE,
1603
  CONSTRAINT `reviews_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE
1602
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1604
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1603
1605
1604
--
1606
--
(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
Lines 4712-4717 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
4712
    SetVersion($DBversion);
4712
    SetVersion($DBversion);
4713
}
4713
}
4714
4714
4715
$DBversion = "3.07.00.XXX";
4716
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
4717
    $dbh->do("DELETE FROM reviews WHERE biblionumber IN (SELECT biblionumber from deletedbiblio)");
4718
    $dbh->do("UPDATE reviews SET borrowernumber = NULL WHERE borrowernumber IN (SELECT borrowernumber FROM deletedborrowers)");
4719
    $dbh->do("ALTER TABLE reviews ADD CONSTRAINT reviews_ibfk_2 FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE");
4720
    $dbh->do("ALTER TABLE reviews ADD CONSTRAINT reviews_ibfk_1 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber ) ON UPDATE CASCADE ON DELETE SET NULL");
4721
    print "Upgrade to $DBversion done (Bug 7493 - Add constraint linking OPAC comment biblionumber to biblio, OPAC comment borrowernumber to borrowers.)\n";
4722
    SetVersion($DBversion);
4723
}
4724
4715
=head1 FUNCTIONS
4725
=head1 FUNCTIONS
4716
4726
4717
=head2 DropAllForeignKeys($table)
4727
=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-detail.tt (-4 / +4 lines)
Lines 878-887 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
878
            <img class="avatar" src="[% review.avatarurl %]" height="80" width="80" alt="" />
878
            <img class="avatar" src="[% review.avatarurl %]" height="80" width="80" alt="" />
879
                [% END %]
879
                [% END %]
880
            <h5>
880
            <h5>
881
                Comment by
881
                Comment [% IF ( review.borrowernumber ) %]by
882
                [% review.title %]
882
                                [% review.title %]
883
                [% review.firstname %]
883
                                [% review.firstname %]
884
                [% review.surname %]
884
                                [% review.surname %][% ELSE %][% END %]
885
            </h5>
885
            </h5>
886
            [% END %]
886
            [% END %]
887
            <small>[% review.datereviewed %]</small>
887
            <small>[% review.datereviewed %]</small>
(-)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 ) %] by
57
            [% IF ( review.borrowernumber && ShowReviewer ) %] by
58
            [% review.firstname %] [% review.surname %][% END %][% END %]</span></p>
58
            [% review.firstname %] [% review.surname %][% END %][% END %]</span></p>
59
        </td>
59
        </td>
60
        <td>
60
        <td>
61
- 

Return to bug 7493