You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/18 21:32:29 UTC
svn commit: r1447480 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/
archiva-webapp/src/main/webapp/js/archiva/
archiva-webapp/src/main/webapp/js/templates/archiva/
Author: olamy
Date: Mon Feb 18 20:32:28 2013
New Revision: 1447480
URL: http://svn.apache.org/r1447480
Log:
ui for change rbac manager impl
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RedbackImplementationInformations.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js?rev=1447480&r1=1447479&r2=1447480&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js Mon Feb 18 20:32:28 2013
@@ -1368,10 +1368,11 @@ define("archiva.general-admin",["jquery"
return null;
}
- RedbackRuntimeConfigurationViewModel=function(redbackRuntimeConfiguration,userManagerImplementationInformations){
+ RedbackRuntimeConfigurationViewModel=function(redbackRuntimeConfiguration,userManagerImplementationInformations,rbacManagerImplementationInformations){
var self=this;
this.redbackRuntimeConfiguration=ko.observable(redbackRuntimeConfiguration);
- this.userManagerImplementationInformations=ko.observable(userManagerImplementationInformations);
+ this.userManagerImplementationInformations=ko.observableArray(userManagerImplementationInformations);
+ this.rbacManagerImplementationInformations=ko.observableArray(rbacManagerImplementationInformations);
this.usedUserManagerImpls=ko.observableArray([]);
@@ -1697,18 +1698,20 @@ define("archiva.general-admin",["jquery"
var mainContent = $("#main-content");
mainContent.html(mediumSpinnerImg());
- $.ajax("restServices/archivaServices/redbackRuntimeConfigurationService/redbackImplementationInformations", {
+ $.ajax("restServices/archivaServices/redbackRuntimeConfigurationService/redbackImplementationsInformations", {
type: "GET",
dataType: 'json',
success: function(data) {
var userManagerImplementationInformations=data?mapManagerImplementationInformations(data.userManagerImplementationInformations):[];
+ var rbacManagerImplementationInformations=data?mapManagerImplementationInformations(data.rbacManagerImplementationInformations):[];
+ $.log("rbacManagerImplementationInformations:"+rbacManagerImplementationInformations.length);
$.ajax("restServices/archivaServices/redbackRuntimeConfigurationService/redbackRuntimeConfiguration", {
type: "GET",
dataType: 'json',
success: function(data) {
var redbackRuntimeConfiguration = mapRedbackRuntimeConfiguration(data);
var redbackRuntimeConfigurationViewModel =
- new RedbackRuntimeConfigurationViewModel(redbackRuntimeConfiguration,userManagerImplementationInformations);
+ new RedbackRuntimeConfigurationViewModel(redbackRuntimeConfiguration,userManagerImplementationInformations,rbacManagerImplementationInformations);
var groups=[];
var useLdap = $.inArray("ldap",redbackRuntimeConfiguration.usedUserManagerImpls)>0
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html?rev=1447480&r1=1447479&r2=1447480&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html Mon Feb 18 20:32:28 2013
@@ -988,14 +988,31 @@
<div class="span4 dotted">
<h5>${$.i18n.prop('redback.runtime.user-managers.impls.choosed')}</h5>
<div style="min-height: 40px" id="user-mananagers-sortables-choosed"
- data-bind="sortable: { template: 'redback-runtime-general-content-usermanagers', data:usedUserManagerImpls,afterMove: userManagerImplMoved}">
+ data-bind="sortable: { template: 'redback-runtime-general-content-impl-informations', data:usedUserManagerImpls,afterMove: userManagerImplMoved}">
</div>
</div>
<div class="span4 dotted">
<h5>${$.i18n.prop('redback.runtime.user-managers.impls.available')}</h5>
<div style="min-height: 40px"id="user-mananagers-sortables-availables"
- data-bind="sortable: {template: 'redback-runtime-general-content-usermanagers',data:availableUserManagerImpls,afterMove: userManagerImplMoved}">
+ data-bind="sortable: {template: 'redback-runtime-general-content-impl-informations',data:availableUserManagerImpls,afterMove: userManagerImplMoved}">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="well">
+ <div class="row-fluid">
+ <div class="span4 dotted">
+ <h5>${$.i18n.prop('redback.runtime.rbac-managers.impls.choosed')}</h5>
+ <div style="min-height: 40px" id="rbac-mananagers-sortables-choosed"
+ data-bind="sortable: { template: 'redback-runtime-general-content-impl-informations', data:usedUserManagerImpls,afterMove: userManagerImplMoved}">
+ </div>
+ </div>
+
+ <div class="span4 dotted">
+ <h5>${$.i18n.prop('redback.runtime.rbac-managers.impls.available')}</h5>
+ <div style="min-height: 40px"id="rbac-mananagers-sortables-availables"
+ data-bind="sortable: {template: 'redback-runtime-general-content-impl-informations',data:availableUserManagerImpls,afterMove: userManagerImplMoved}">
</div>
</div>
</div>
@@ -1232,7 +1249,7 @@
</script>
-<script id="redback-runtime-general-content-usermanagers" type="text/html">
+<script id="redback-runtime-general-content-impl-informations" type="text/html">
<div class="well draggable-item">
${$data.description}
</div>