From: Olivier Lamy Date: Fri, 23 Nov 2012 16:28:29 +0000 (+0000) Subject: [MRM-1714] using LDAP can be configurable with the ui X-Git-Tag: archiva-1.4-M4~595 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=474cd1b61dd56ad3d1c0d2f05a9f47e47e927e6d;p=archiva.git [MRM-1714] using LDAP can be configurable with the ui implements ui part for updating values. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1412943 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index 31559507a..a0c14ee0a 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -1147,7 +1147,70 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" ko.applyBindings( statisticsReportViewModel, mainContent.get( 0 ) ); ko.applyBindings( healthReportViewModel, mainContent.get( 0 ) ); } - }) + }); + } + + + ArchivaRuntimeConfiguration=function(userManagerImpl){ + this.userManagerImpl=ko.observable(userManagerImpl); + } + + ArchivaRuntimeConfigurationViewModel=function(archivaRuntimeConfiguration){ + this.archivaRuntimeConfiguration=ko.observable(archivaRuntimeConfiguration); + self=this; + + saveArchivaRuntimeConfiguration=function(){ + $.log("saveArchivaRuntimeConfiguration"); + + + clearUserMessages(); + var userMessages=$("#user-messages"); + userMessages.html(mediumSpinnerImg()); + $("#repository-group-save" ).button('loading'); + $.ajax("restServices/archivaServices/archivaRuntimeConfigurationService/archivaRuntimeConfiguration", + { + type: "PUT", + contentType: 'application/json', + data:ko.toJSON(self.archivaRuntimeConfiguration), + dataType: 'json', + success: function(data) { + var message=$.i18n.prop('archiva-runtime-configuration.updated'); + displaySuccessMessage(message); + }, + error: function(data) { + var res = $.parseJSON(data.responseText); + displayRestError(res); + }, + complete:function(data){ + removeMediumSpinnerImg(userMessages); + } + } + ); + + } + } + + displayRuntimeConfiguration=function(){ + $.log("displayRuntimeConfiguration"); + var mainContent = $("#main-content"); + mainContent.html(mediumSpinnerImg()); + + + $.ajax("restServices/archivaServices/archivaRuntimeConfigurationService/archivaRuntimeConfiguration", { + type: "GET", + dataType: 'json', + success: function(data) { + var archivaRuntimeConfiguration = mapArchivaRuntimeConfiguration(data); + var archivaRuntimeConfigurationViewModel = new ArchivaRuntimeConfigurationViewModel(archivaRuntimeConfiguration); + mainContent.html( $( "#runtime-configuration-main" ).tmpl( ) ); + ko.applyBindings(archivaRuntimeConfigurationViewModel,$("#runtime-configuration-content" ).get(0)); + } + }); + + } + + mapArchivaRuntimeConfiguration=function(data){ + return new ArchivaRuntimeConfiguration(data.userManagerImpl); } }); \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js index b201776ff..67fe5278c 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js @@ -195,6 +195,7 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa { text : $.i18n.prop('menu.system-status') , id: "menu-system-status-list-a" , href: "#status" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displaySystemStatus()}}, { text : $.i18n.prop('menu.appearance-configuration') , id: "menu-appearance-list-a" , href: "#appearance" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayAppearanceConfiguration()}}, { text : $.i18n.prop('menu.ui-configuration') , id: "menu-ui-configuration-list-a" , href: "#uiconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayUiConfiguration()}}, + { text : $.i18n.prop('menu.runtime-configuration') , id: "menu-runtime-configuration-list-a" , href: "#runtimeconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRuntimeConfiguration()}}, { text : $.i18n.prop('menu.reports') , id: "menu-report-list-a" , href: "#reports" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayReportsPage()}} ]); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html index 77d2f61d0..918d85617 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html @@ -885,3 +885,31 @@ {{/each}} + + + +