@@ -, +, @@ --- Koha/ArticleRequest.pm | 2 +- Koha/ArticleRequest/Status.pm | 4 ++-- Koha/ArticleRequests.pm | 6 +++--- Koha/Biblio.pm | 2 +- Koha/Borrower.pm | 2 +- circ/article-requests.pl | 2 +- installer/data/mysql/atomicupdate/bug_14610.sql | 2 +- .../intranet-tmpl/prog/en/modules/circ/article-requests.tt | 12 ++++++------ .../intranet-tmpl/prog/en/modules/circ/request-article.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- t/db_dependent/ArticleRequests.t | 10 +++++----- 11 files changed, 25 insertions(+), 25 deletions(-) --- a/Koha/ArticleRequest.pm +++ a/Koha/ArticleRequest.pm @@ -48,7 +48,7 @@ Koha::ArticleRequest - Koha Article Request Object class sub open { my ($self) = @_; - $self->status(Koha::ArticleRequest::Status::Open); + $self->status(Koha::ArticleRequest::Status::Pending); $self->notify(); return $self; } --- a/Koha/ArticleRequest/Status.pm +++ a/Koha/ArticleRequest/Status.pm @@ -19,8 +19,8 @@ package Koha::ArticleRequest::Status; use Modern::Perl; -sub Open { - return 'OPEN'; +sub Pending { + return 'PENDING'; } sub Processing { --- a/Koha/ArticleRequests.pm +++ a/Koha/ArticleRequests.pm @@ -38,13 +38,13 @@ Koha::ArticleRequests - Koha ArticleRequests Object class =cut -=head3 open +=head3 pending =cut -sub open { +sub pending { my ( $self, $branchcode ) = @_; - my $params = { status => Koha::ArticleRequest::Status::Open }; + my $params = { status => Koha::ArticleRequest::Status::Pending }; $params->{branchcode} = $branchcode if $branchcode; return Koha::ArticleRequests->search( $params ); } --- a/Koha/Biblio.pm +++ a/Koha/Biblio.pm @@ -159,7 +159,7 @@ sub article_requests_current { { biblionumber => $self->biblionumber(), -or => [ - { status => Koha::ArticleRequest::Status::Open }, + { status => Koha::ArticleRequest::Status::Pending }, { status => Koha::ArticleRequest::Status::Processing } ] } --- a/Koha/Borrower.pm +++ a/Koha/Borrower.pm @@ -72,7 +72,7 @@ sub article_requests_current { { borrowernumber => $self->id(), -or => [ - { status => Koha::ArticleRequest::Status::Open }, + { status => Koha::ArticleRequest::Status::Pending }, { status => Koha::ArticleRequest::Status::Processing } ] } --- a/circ/article-requests.pl +++ a/circ/article-requests.pl @@ -40,7 +40,7 @@ my $branchcode = $query->param('branchcode') || C4::Context->userenv->{'branch'} $template->param( branchcode => $branchcode, - article_requests_open => scalar Koha::ArticleRequests->open($branchcode), + article_requests_pending => scalar Koha::ArticleRequests->pending($branchcode), article_requests_processing => scalar Koha::ArticleRequests->processing($branchcode), ); --- a/installer/data/mysql/atomicupdate/bug_14610.sql +++ a/installer/data/mysql/atomicupdate/bug_14610.sql @@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS `article_requests` ( `date` text, `pages` text, `chapters` text, - `status` enum('OPEN','PROCESSING','COMPLETED','CANCELED') NOT NULL DEFAULT 'OPEN', + `status` enum('PENDING','PROCESSING','COMPLETED','CANCELED') NOT NULL DEFAULT 'PENDING', `notes` text, `created_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `updated_on` timestamp NULL DEFAULT NULL, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -110,13 +110,13 @@
Title | @@ -134,7 +134,7 @@
---|
@@ -235,7 +235,7 @@ |