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

(-)a/Koha/Schema/Result/Borrower.pm (+8 lines)
Lines 2237-2242 __PACKAGE__->has_many( Link Here
2237
  { cascade_copy => 0, cascade_delete => 0 },
2237
  { cascade_copy => 0, cascade_delete => 0 },
2238
);
2238
);
2239
2239
2240
__PACKAGE__->belongs_to(
2241
    "category",
2242
    "Koha::Schema::Result::Category",
2243
    { "foreign.categorycode"  => "self.categorycode" },
2244
    { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },
2245
);
2246
2247
2240
=head2 koha_objects_class
2248
=head2 koha_objects_class
2241
2249
2242
Missing POD for koha_objects_class.
2250
Missing POD for koha_objects_class.
(-)a/Koha/Schema/Result/Suggestion.pm (+24 lines)
Lines 596-601 __PACKAGE__->belongs_to( Link Here
596
    },
596
    },
597
);
597
);
598
598
599
__PACKAGE__->belongs_to(
600
    "library",
601
    "Koha::Schema::Result::Branch",
602
    { "foreign.branchcode" => "self.branchcode" },
603
    {
604
        is_deferrable => 1,
605
        join_type     => "LEFT",
606
        on_delete     => "SET NULL",
607
        on_update     => "CASCADE",
608
    },
609
);
610
611
__PACKAGE__->belongs_to(
612
    "fund",
613
    "Koha::Schema::Result::Aqbudget",
614
    { budget_id => "budgetid" },
615
    {
616
        is_deferrable => 1,
617
        join_type     => "LEFT",
618
        on_delete     => "SET NULL",
619
        on_update     => "CASCADE",
620
    },
621
);
622
599
__PACKAGE__->add_columns(
623
__PACKAGE__->add_columns(
600
    '+archived' => { is_boolean => 1 },
624
    '+archived' => { is_boolean => 1 },
601
);
625
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-11 / +10 lines)
Lines 1351-1357 Link Here
1351
                                    {
1351
                                    {
1352
                                        data: "me.title",
1352
                                        data: "me.title",
1353
                                        searchable: true,
1353
                                        searchable: true,
1354
                                        orderable: false,
1354
                                        orderable: true,
1355
                                        render: function (data, type, row, meta) {
1355
                                        render: function (data, type, row, meta) {
1356
                                            let node = '<a href="suggestion.pl?suggestionid=%s&amp;op=show" title="%s">%s'.format(row.suggestion_id, _("suggestion"), row.title);
1356
                                            let node = '<a href="suggestion.pl?suggestionid=%s&amp;op=show" title="%s">%s'.format(row.suggestion_id, _("suggestion"), row.title);
1357
                                            if(row.author) node += ', by %s'.format(row.author);
1357
                                            if(row.author) node += ', by %s'.format(row.author);
Lines 1372-1378 Link Here
1372
                                    {
1372
                                    {
1373
                                        data: "suggester.surname:suggester.firstname:suggester.cardnumber",
1373
                                        data: "suggester.surname:suggester.firstname:suggester.cardnumber",
1374
                                        searchable: true,
1374
                                        searchable: true,
1375
                                        orderable: false,
1375
                                        orderable: true,
1376
                                        render: function (data, type, row, meta) {
1376
                                        render: function (data, type, row, meta) {
1377
                                            let suggester = row.suggester;
1377
                                            let suggester = row.suggester;
1378
                                            let node = '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=%s">%s'.format(suggester.patron_id, suggester.surname);
1378
                                            let node = '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=%s">%s'.format(suggester.patron_id, suggester.surname);
Lines 1385-1391 Link Here
1385
                                    {
1385
                                    {
1386
                                        data: "suggester.category.name",
1386
                                        data: "suggester.category.name",
1387
                                        searchable: false,
1387
                                        searchable: false,
1388
                                        orderable: false,
1388
                                        orderable: true,
1389
                                        render: function (data, type, row, meta) {
1389
                                        render: function (data, type, row, meta) {
1390
                                            return escape_str(row.suggester.category.name);
1390
                                            return escape_str(row.suggester.category.name);
1391
                                        },
1391
                                        },
Lines 1399-1407 Link Here
1399
                                        },
1399
                                        },
1400
                                    },
1400
                                    },
1401
                                    {
1401
                                    {
1402
                                        data: "",
1402
                                        data: "patron_reason",
1403
                                        searchable: false,
1403
                                        searchable: false,
1404
                                        orderable: false,
1404
                                        orderable: true,
1405
                                        render: function (data, type, row, meta) {
1405
                                        render: function (data, type, row, meta) {
1406
                                            return escape_str(row._strings.patron_reason.str ? row._strings.patron_reason.str : '');
1406
                                            return escape_str(row._strings.patron_reason.str ? row._strings.patron_reason.str : '');
1407
                                        },
1407
                                        },
Lines 1409-1415 Link Here
1409
                                    {
1409
                                    {
1410
                                        data: "manager.surname:manager.firstname",
1410
                                        data: "manager.surname:manager.firstname",
1411
                                        searchable: true,
1411
                                        searchable: true,
1412
                                        orderable: false,
1412
                                        orderable: true,
1413
                                        render: function (data, type, row, meta) {
1413
                                        render: function (data, type, row, meta) {
1414
                                            let node = '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=%s">%s'.format(row.manager.patron_id, row.manager.surname);
1414
                                            let node = '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=%s">%s'.format(row.manager.patron_id, row.manager.surname);
1415
                                            if(row.manager.firstname) node += ', %s'.format(row.manager.firstname);
1415
                                            if(row.manager.firstname) node += ', %s'.format(row.manager.firstname);
Lines 1428-1434 Link Here
1428
                                    {
1428
                                    {
1429
                                        data: "last_modifier.surname:last_modifier.firstname",
1429
                                        data: "last_modifier.surname:last_modifier.firstname",
1430
                                        searchable: true,
1430
                                        searchable: true,
1431
                                        orderable: false,
1431
                                        orderable: true,
1432
                                        render: function (data, type, row, meta) {
1432
                                        render: function (data, type, row, meta) {
1433
                                            let node = '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=%s">%s'.format(row.last_modifier.patron_id, row.last_modifier.surname);
1433
                                            let node = '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=%s">%s'.format(row.last_modifier.patron_id, row.last_modifier.surname);
1434
                                            if(row.last_modifier.firstname) node += ', %s'.format(row.last_modifier.firstname);
1434
                                            if(row.last_modifier.firstname) node += ', %s'.format(row.last_modifier.firstname);
Lines 1455-1461 Link Here
1455
                                    {
1455
                                    {
1456
                                        data: "library.name",
1456
                                        data: "library.name",
1457
                                        searchable: false,
1457
                                        searchable: false,
1458
                                        orderable: false,
1458
                                        orderable: true,
1459
                                        render: function (data, type, row, meta) {
1459
                                        render: function (data, type, row, meta) {
1460
                                            return escape_str(row.library.name ? row.library.name : '');
1460
                                            return escape_str(row.library.name ? row.library.name : '');
1461
                                        },
1461
                                        },
Lines 1463-1469 Link Here
1463
                                    {
1463
                                    {
1464
                                        data: "fund.name",
1464
                                        data: "fund.name",
1465
                                        searchable: false,
1465
                                        searchable: false,
1466
                                        orderable: false,
1466
                                        orderable: true,
1467
                                        render: function (data, type, row, meta) {
1467
                                        render: function (data, type, row, meta) {
1468
                                            return escape_str(row.fund ? row.fund.name : '');
1468
                                            return escape_str(row.fund ? row.fund.name : '');
1469
                                        },
1469
                                        },
Lines 1471-1477 Link Here
1471
                                    {
1471
                                    {
1472
                                        data: "staff_note",
1472
                                        data: "staff_note",
1473
                                        searchable: false,
1473
                                        searchable: false,
1474
                                        orderable: false,
1474
                                        orderable: true,
1475
                                        render: function (data, type, row, meta) {
1475
                                        render: function (data, type, row, meta) {
1476
                                            return escape_str(row.staff_note ? row.staff_note : '');
1476
                                            return escape_str(row.staff_note ? row.staff_note : '');
1477
                                        },
1477
                                        },
1478
- 

Return to bug 33430