Author: olamy
Date: Mon Mar 4 17:15:22 2013
New Revision: 1452407
URL: http://svn.apache.org/r1452407
Log:
cleanup a bit no need to observe the fake mapping for add line
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=1452407&r1=1452406&r2=1452407&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 Mar 4 17:15:22 2013
@@ -1724,7 +1724,9 @@ define("archiva.general-admin",["jquery"
}
});
- this.newLdapGroupMapping=ko.observable(new
LdapGroupMapping("",[],false,self.modifyLdapGroupMapping));
+ this.newLdapGroupMapping=ko.observable(new
LdapGroupMapping("",[],false,null));
+
+ this.ldapSelectOptionCaption =
$.i18n.prop('redback.runtime.ldap.mapping.select.group');
addLdapGroupMapping=function(){
// FIXME validate datas from ldapGroupMapping
@@ -1740,12 +1742,11 @@ define("archiva.general-admin",["jquery"
{
type: "PUT",
contentType: 'application/json',
- data:ko.toJSON(new
LdapGroupMapping(self.newLdapGroupMapping().group(),self.newLdapGroupMapping().roleNames(),false,self.modifyLdapGroupMapping)),
+ data:ko.toJSON(new
LdapGroupMapping(self.newLdapGroupMapping().group(),self.newLdapGroupMapping().roleNames(),false,null)),
dataType: 'json',
success: function(data) {
self.redbackRuntimeConfiguration().ldapGroupMappings
.unshift(new
LdapGroupMapping(self.newLdapGroupMapping().group(),self.newLdapGroupMapping().roleNames(),false,self.modifyLdapGroupMapping));
- self.newLdapGroupMapping=ko.observable(new
LdapGroupMapping("",[],false,self.modifyLdapGroupMapping));
$.log("addLdapGroupMapping:"+self.redbackRuntimeConfiguration().ldapGroupMappings().length);
$("#ldap-group-mappings-div select" ).select2({width:
"element"});
var
message=$.i18n.prop('redback-runtime-ldap-group-mapping.added');
@@ -1759,6 +1760,10 @@ define("archiva.general-admin",["jquery"
).always(
function(){
removeMediumSpinnerImg(userMessages);
+ $.log("addLdapGroupMapping#always");
+ //self.newLdapGroupMapping().group("");
+ //self.newLdapGroupMapping().roleNames([]);
+ self.newLdapGroupMapping=ko.observable(new
LdapGroupMapping("",[],false,null));
saveButton.button('reset');
}
);
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=1452407&r1=1452406&r2=1452407&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 Mar 4 17:15:22 2013
@@ -1247,30 +1247,6 @@
</script>
-<script id="redback-runtime-ldap-mapping-grid" type="text/html">
- <thead>
- <tr>
- <th>${$.i18n.prop('redback.runtime.ldap.mapping.group.label')}</th>
- <th>${$.i18n.prop('redback.runtime.ldap.mapping.roles.label')}</th>
- </tr>
- </thead>
- <tbody id="ldap-group-mappings-tbody">
-
- {{each(i, ldapGroupMapping) itemsOnCurrentPage()}}
- <tr>
- <td>${ldapGroupMapping.group()}
- <select id="roles-group-${ldapGroupMapping.group()}"
data-bind="options: ldapGroups, value: ldapGroupMapping.group, optionsCaption:
'Select a LDAP Group'"
- size="1"></select>
- </td>
- <td>
- <select id="roles-group-mapping-${ldapGroupMapping.group()}"
data-bind="options: $parent.allRoleNames, selectedOptions:
ldapGroupMapping.roleNames"
- size="5" multiple="true" ></select>
- </td>
- </tr>
- {{/each}}
- </tbody>
-</script>
-
<script id="redback-runtime-ldap-mapping-tmpl" type="text/html">
<div class="well" id="ldap-group-mappings-div">
<table class="table table-condensed">
@@ -1289,7 +1265,7 @@
</span>
</td>
<td>
- <select data-bind="options: ldapGroups, optionsCaption: 'Select a
LDAP Group',value: $parent.newLdapGroupMapping().group" size="1">
+ <select data-bind="options: ldapGroups,value:
$parent.newLdapGroupMapping().group" size="1">
</select>
</td>
<td>
@@ -1319,6 +1295,34 @@
</div>
</script>
+
+<!-- doesn't with simple grid knockout binding -->
+<!--
+<script id="redback-runtime-ldap-mapping-grid" type="text/html">
+ <thead>
+ <tr>
+ <th>${$.i18n.prop('redback.runtime.ldap.mapping.group.label')}</th>
+ <th>${$.i18n.prop('redback.runtime.ldap.mapping.roles.label')}</th>
+ </tr>
+ </thead>
+ <tbody id="ldap-group-mappings-tbody">
+
+ {{each(i, ldapGroupMapping) itemsOnCurrentPage()}}
+ <tr>
+ <td>${ldapGroupMapping.group()}
+ <select id="roles-group-${ldapGroupMapping.group()}" data-bind="options:
ldapGroups, value: ldapGroupMapping.group, optionsCaption: 'Select a LDAP
Group'"
+ size="1"></select>
+ </td>
+ <td>
+ <select id="roles-group-mapping-${ldapGroupMapping.group()}"
data-bind="options: $parent.allRoleNames, selectedOptions:
ldapGroupMapping.roleNames"
+ size="5" multiple="true" ></select>
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+</script>
+-->
+
<script id="redback-runtime-general-content-impl-informations"
type="text/html">
<div class="well draggable-item">
${$data.description}
