Bugzilla – Attachment 139863 Details for
Bug 31374
Add a non-public note column to the suggestions table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31374: (follow-up) change private note to staff_note and reorder columns
Bug-31374-follow-up-change-private-note-to-staffno.patch (text/plain), 8.81 KB, created by
Katrin Fischer
on 2022-08-27 14:52:00 UTC
(
hide
)
Description:
Bug 31374: (follow-up) change private note to staff_note and reorder columns
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-08-27 14:52:00 UTC
Size:
8.81 KB
patch
obsolete
>From 4e4b505237972ff9f3144d5326007de13f41719d Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Mon, 22 Aug 2022 22:21:22 +0000 >Subject: [PATCH] Bug 31374: (follow-up) change private note to staff_note and > reorder columns > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > Koha/Schema/Result/Suggestion.pm | 4 ++-- > Koha/Suggestion.pm | 2 +- > admin/columns_settings.yml | 4 ++-- > api/v1/swagger/definitions/suggestion.yaml | 2 +- > installer/data/mysql/atomicupdate/bug_31374.pl | 8 ++++---- > installer/data/mysql/kohastructure.sql | 2 +- > .../prog/en/modules/suggestion/suggestion.tt | 14 +++++++------- > 7 files changed, 18 insertions(+), 18 deletions(-) > >diff --git a/Koha/Schema/Result/Suggestion.pm b/Koha/Schema/Result/Suggestion.pm >index f822dc1a4f..edc76ee7ad 100644 >--- a/Koha/Schema/Result/Suggestion.pm >+++ b/Koha/Schema/Result/Suggestion.pm >@@ -136,7 +136,7 @@ is the suggestion archived? > > note entered on the suggestion > >-=head2 privatenote >+=head2 staff_note > > data_type: 'longtext' > is_nullable: 1 >@@ -333,7 +333,7 @@ __PACKAGE__->add_columns( > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "note", > { data_type => "longtext", is_nullable => 1 }, >- "privatenote", >+ "staff_note", > { data_type => "longtext", is_nullable => 1 }, > "author", > { data_type => "varchar", is_nullable => 1, size => 80 }, >diff --git a/Koha/Suggestion.pm b/Koha/Suggestion.pm >index f66f9f9209..9d9e460a65 100644 >--- a/Koha/Suggestion.pm >+++ b/Koha/Suggestion.pm >@@ -160,7 +160,7 @@ sub to_api_mapping { > lastmodificationby => 'last_status_change_by', > STATUS => 'status', > note => 'note', >- privatenote => 'privatenote', >+ staff_note => 'staff_note', > author => 'author', > title => 'title', > copyrightdate => 'copyright_date', >diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml >index c5ebf56d10..b5359610e2 100644 >--- a/admin/columns_settings.yml >+++ b/admin/columns_settings.yml >@@ -191,9 +191,9 @@ modules: > - > columnname: library_fund > - >- columnname: suggestion_status >+ columnname: staff_note > - >- columnname: privatenote >+ columnname: suggestion_status > - > columnname: actions > cannot_be_toggled: 1 >diff --git a/api/v1/swagger/definitions/suggestion.yaml b/api/v1/swagger/definitions/suggestion.yaml >index 780773bd42..c0b4b58450 100644 >--- a/api/v1/swagger/definitions/suggestion.yaml >+++ b/api/v1/swagger/definitions/suggestion.yaml >@@ -75,7 +75,7 @@ properties: > - string > - "null" > description: note entered on the suggestion >- privatenote: >+ staff_note: > type: > - string > - "null" >diff --git a/installer/data/mysql/atomicupdate/bug_31374.pl b/installer/data/mysql/atomicupdate/bug_31374.pl >index 861a71f856..80c278e934 100755 >--- a/installer/data/mysql/atomicupdate/bug_31374.pl >+++ b/installer/data/mysql/atomicupdate/bug_31374.pl >@@ -2,19 +2,19 @@ use Modern::Perl; > > return { > bug_number => "31374", >- description => "Add a non-public note cololumn to the suggestions table", >+ description => "Add a non-public note collumn to the suggestions table", > up => sub { > my ($args) = @_; > my ($dbh, $out) = @$args{qw(dbh out)}; >- if( !column_exists( 'suggestions', 'privatenote' ) ) { >+ if( !column_exists( 'suggestions', 'staff_note' ) ) { > $dbh->do(q{ > ALTER TABLE suggestions >- ADD COLUMN privatenote longtext NULL DEFAULT NULL >+ ADD COLUMN staff_note longtext NULL DEFAULT NULL > COMMENT "suggestions table non-public note" > AFTER note > }); > } > # Print useful stuff here >- say $out "Add privatenote column to suggestions table"; >+ say $out "Add staff_note column to suggestions table"; > }, > }; >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 6462f21116..b9ec78eaca 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -5185,7 +5185,7 @@ CREATE TABLE `suggestions` ( > `STATUS` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'suggestion status (ASKED, CHECKED, ACCEPTED, REJECTED, ORDERED, AVAILABLE or a value from the SUGGEST_STATUS authorised value category)', > `archived` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'is the suggestion archived?', > `note` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'note entered on the suggestion', >- `privatenote` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'non-public note entered on the suggestion', >+ `staff_note` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'non-public note entered on the suggestion', > `author` varchar(80) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'author of the suggested item', > `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'title of the suggested item', > `copyrightdate` smallint(6) DEFAULT NULL COMMENT 'copyright date of the suggested item', >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 0005a3278d..70640fa035 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -185,10 +185,10 @@ > [% note | html %] > </li> > [% END %] >- [% IF ( privatenote ) %] >+ [% IF ( staff_note ) %] > <li> > <span class="label">Notes:</span> >- [% privatenote | html %] >+ [% staff_note | html %] > </li> > [% END %] > </ol> >@@ -417,7 +417,7 @@ > </li> > <li> > <label for="note">Non-public notes:</label> >- <textarea name="privatenote" id="privatenote" rows="5" cols="40">[% privatenote | html %]</textarea> >+ <textarea name="staff_note" id="staff_note" rows="5" cols="40">[% staff_note | html %]</textarea> > </li> > </ol> > </fieldset> >@@ -753,8 +753,8 @@ > <th>Last updated</th> > <th>Library</th> > <th>Fund</th> >- <th>Status</th> > <th>Non-public note</th> >+ <th>Status</th> > <th class="NoSort noExport"> </th> > </tr> > </thead> >@@ -832,6 +832,9 @@ > <td> > [% s.fund.budget_name | html %] > </td> >+ <td> >+ [% s.staff_note | html %] >+ </td> > <td> > [% IF s.STATUS == 'ASKED' %] > <span>Pending</span> >@@ -855,9 +858,6 @@ > <br />([% s.reason | html %]) > [% END %] > </td> >- <td> >- [% s.privatenote | html %] >- </td> > <td class="actions"> > <div class="btn-group dropup"> > <a class="btn btn-default btn-xs" role="button" href="suggestion.pl?suggestionid=[% s.suggestionid | html %]&op=edit"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="more_actions_[% s.suggestionid | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 31374
:
139212
|
139213
|
139214
|
139216
|
139508
|
139526
|
139527
|
139528
|
139529
|
139530
|
139627
|
139858
|
139859
|
139860
|
139861
|
139862
| 139863 |
139864