From 54e0b1aa5f45fa430202ddd977f197e45b15f4ae Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi
Date: Mon, 16 Apr 2018 16:04:26 -0300
Subject: [PATCH] Bug 20568: Move value => client_id + secret
This patch addresses the request from Julian that api keys are expected
to be client id/secret pairs.
It does so by
- Adding 'client_id' and 'secret' columns
- Removing 'value'
Tests got adjusted and so controller scripts and templates.
Both libs and tests changes have been squashed. This ones remain in
order to keep Owen's attribution on the template changes and avoid
rebase conflicts.
Signed-off-by: Kyle M Hall
Signed-off-by: Tomas Cohen Arazi
---
.../prog/en/includes/members-toolbar.inc | 2 +-
.../prog/en/modules/members/apikeys.tt | 16 +++++++++-------
.../bootstrap/en/modules/opac-apikeys.tt | 12 +++++++-----
members/apikeys.pl | 12 ++++++------
opac/opac-apikeys.pl | 13 ++++++-------
5 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index 280368bcb5..0c731b5a00 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -61,7 +61,7 @@
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
-