From 4f251fbd52d345a86b90cc928942cfc4c25ea0ec Mon Sep 17 00:00:00 2001 From: disc5 Date: Tue, 10 Nov 2015 15:14:23 +0100 Subject: [PATCH] ng Admin > Added Description Field --- .../UserInterfaceHook/REST/apps/admin/js/app.js | 2 +- .../UserInterfaceHook/REST/apps/admin/js/controllers.js | 6 ++++-- .../REST/apps/admin/lang/angular_en-US.js | 3 +++ .../REST/apps/admin/partials/clientedit.html | 7 +++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/js/app.js b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/js/app.js index 11f491fe..107b4da2 100755 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/js/app.js +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/js/app.js @@ -30,7 +30,7 @@ var app = angular.module('myApp', [ /* * Some (important) global constants, all in one place */ -app.constant('version', '1.2'); // Application version +app.constant('version', '1.3'); // Application version app.constant('apiKey', 'apollon'); // API-Key used to log into admin-panel (via username/password) app.constant('restIliasLoginURL', '/v1/ilauth/rtoken2bearer'); // rToken to Bearer-Token Endpoint app.constant('restTokenURL', '/v1/oauth2/token'); // Bearer-Token from Username, Password, API-Key pair Endpoint diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/js/controllers.js b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/js/controllers.js index f604a700..98fa3cdc 100755 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/js/controllers.js +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/js/controllers.js @@ -335,7 +335,8 @@ ctrl.controller("ClientEditCtrl", function($scope, $filter, dialogs, clientStora oauth2_resource_refresh_active: $scope.current.oauth2_resource_refresh_active, access_user_csv: $scope.current.access_user_csv, ip_restriction_active : $scope.current.ip_restriction_active, - access_ip_csv: $scope.current.access_ip_csv + access_ip_csv: $scope.current.access_ip_csv, + description: $scope.current.description }, // Success function (response) { @@ -375,7 +376,8 @@ ctrl.controller("ClientEditCtrl", function($scope, $filter, dialogs, clientStora oauth2_resource_refresh_active: $scope.current.oauth2_resource_refresh_active, access_user_csv: $scope.current.access_user_csv, ip_restriction_active : $scope.current.ip_restriction_active, - access_ip_csv: $scope.current.access_ip_csv + access_ip_csv: $scope.current.access_ip_csv, + description: $scope.current.description }, // Success function (response) { diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/lang/angular_en-US.js b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/lang/angular_en-US.js index 613d2927..597d27c3 100755 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/lang/angular_en-US.js +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/lang/angular_en-US.js @@ -125,6 +125,9 @@ lang_en_us.config(function($translateProvider) { EDIT_CONSENT_SCOPE: 'Enable an additional page for the OAuth2 grant types "authcode" and "implicit grant" to inform the user about the scope of the application.', EDIT_ALLOWED_IPS: 'IP Restriction', EDIT_IP_ACCESS_TEXT: 'Usage of this client/API-Key can be restricted to IP addresses. Specify a comma separated list of ip addresses here.', + EDIT_DESCRIPTION: 'Description', + EDIT_DESCRIPTION_TEXT: '' + }); diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/partials/clientedit.html b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/partials/clientedit.html index 089c1c48..9c016937 100755 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/partials/clientedit.html +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/apps/admin/partials/clientedit.html @@ -46,6 +46,13 @@

{{'EDIT_BASIC_INFORMATION' | translate}}

+
+ + {{'EDIT_DESCRIPTION_TEXT' | translate}} + +
+ +