Author: olamy
Date: Tue Mar 5 00:02:23 2013
New Revision: 1452603
URL: http://svn.apache.org/r1452603
Log:
better to use a select2 binding
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
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/archiva.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js?rev=1452603&r1=1452602&r2=1452603&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
Tue Mar 5 00:02:23 2013
@@ -70,6 +70,7 @@ $.ajax({
"jquery.json": "jquery.json-2.3.min",
"knockout": "knockout-2.2.0.debug",
"knockout.simpleGrid": "knockout.simpleGrid",
+ "knockout.select2": "knockout.select2",
"knockout.sortable": "knockout-sortable",
"jquery.iframe.transport": "jquery.iframe-transport-1.4",
"jquery.fileupload": "jquery.fileupload-5.10.0",
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=1452603&r1=1452602&r2=1452603&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
Tue Mar 5 00:02:23 2013
@@ -17,7 +17,7 @@
* under the License.
*/
define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout","knockout.simpleGrid",
- "knockout.sortable","jquery.ui","jquery.validate","bootstrap","select2"]
+
"knockout.sortable","jquery.ui","jquery.validate","bootstrap","select2","knockout.select2"]
,
function(jquery,i18n,utils,jqueryTmpl,ko,simpleGrid,sortable,jqueryUi,validate,bootstrap,select2)
{
//-------------------------
@@ -1388,7 +1388,7 @@ define("archiva.general-admin",["jquery"
this.availableUserManagerImpls=ko.observableArray([]);
this.availableRbacManagerImpls=ko.observableArray([]);
- this.allRoleNames=[];
+ this.allRoleNames=ko.observableArray([]);
findUserManagerImplementationInformation=function(id){
for(var i= 0;i<self.userManagerImplementationInformations().length;i++){
@@ -1694,7 +1694,6 @@ define("archiva.general-admin",["jquery"
self.modifiesLdapGroupMappings().push(ldapGroupMapping);
}
$.log('modifyLdapGroupMapping:'+ldapGroupMapping.group()+','+self.modifiesLdapGroupMappings().length);
- //$("#ldap-group-mappings-div select" ).select2({width: "element"});
};
//olamy could be better but some reason doesn't work and I didn't find
enough to understand why :-)
/*self.gridldapMappingsViewModel = new ko.simpleGrid.viewModel({
@@ -1726,11 +1725,15 @@ define("archiva.general-admin",["jquery"
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
$.log("addLdapGroupMapping:"+self.newLdapGroupMapping().group());
+ clearUserMessages();
+
+ if (self.newLdapGroupMapping().roleNames().length<1){
+ displayErrorMessage(
$.i18n.prop('redback-runtime-ldap-group-mapping.role.mandatory'));
+ return;
+ }
var mainContent=$("#main-content");
var saveButton = mainContent.find("#redback-runtime-configuration-save"
);
@@ -1748,7 +1751,6 @@ define("archiva.general-admin",["jquery"
self.redbackRuntimeConfiguration().ldapGroupMappings
.unshift(new
LdapGroupMapping(self.newLdapGroupMapping().group(),self.newLdapGroupMapping().roleNames(),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');
displaySuccessMessage(message);
},
@@ -1761,9 +1763,9 @@ define("archiva.general-admin",["jquery"
function(){
removeMediumSpinnerImg(userMessages);
$.log("addLdapGroupMapping#always");
- //self.newLdapGroupMapping().group("");
- //self.newLdapGroupMapping().roleNames([]);
- self.newLdapGroupMapping=ko.observable(new
LdapGroupMapping("",[],false,null));
+ //self.newLdapGroupMapping.group("");
+ //self.newLdapGroupMapping.roleNames([]);
+ //self.newLdapGroupMapping(new LdapGroupMapping("",[],false,null));
saveButton.button('reset');
}
);
@@ -1788,7 +1790,6 @@ define("archiva.general-admin",["jquery"
success: function(data) {
$.log("deleteLdapGroupMapping:"+ldapGroupMapping.group());
self.redbackRuntimeConfiguration().ldapGroupMappings.remove(ldapGroupMapping);
- $("#ldap-group-mappings-div select" ).select2({width:
"element"});
var
message=$.i18n.prop('redback-runtime-ldap-group-mapping.deleted');
displaySuccessMessage(message);
},
@@ -1953,7 +1954,7 @@ define("archiva.general-admin",["jquery"
return item.name;
});
- redbackRuntimeConfigurationViewModel.allRoleNames=allRoleNames;
+
redbackRuntimeConfigurationViewModel.allRoleNames=ko.observableArray(allRoleNames);
if
(redbackRuntimeConfigurationViewModel.redbackRuntimeConfiguration().ldapConfiguration().useRoleNameAsGroup())
{
// if using groups == roles add all as mapping except already mapped
$.each(groups,function(idx,item){
@@ -1978,7 +1979,6 @@ define("archiva.general-admin",["jquery"
ko.applyBindings(redbackRuntimeConfigurationViewModel,$("#redback-runtime-configuration-content"
).get(0));
activateRedbackRuntimeGeneralFormValidation();
activateLdapConfigurationFormValidation();
- $("#ldap-group-mappings-div select" ).select2({width: "element"});
}
LdapGroupMapping=function(group,roleNames,automatic,subscribeFn){
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=1452603&r1=1452602&r2=1452603&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
Tue Mar 5 00:02:23 2013
@@ -1265,12 +1265,13 @@
</span>
</td>
<td>
- <select data-bind="options: ldapGroups,value:
$parent.newLdapGroupMapping().group" size="1">
+ <select data-bind="options: ldapGroups,value:
$parent.newLdapGroupMapping().group, select2: { }"
+ size="1" style="min-width: 150px">
</select>
</td>
<td>
- <select data-bind="options: $parent.allRoleNames, selectedOptions:
$parent.newLdapGroupMapping().roleNames"
- size="5" multiple="true" ></select>
+ <select data-bind="options: $parent.allRoleNames, selectedOptions:
$parent.newLdapGroupMapping().roleNames, select2: { }"
+ size="5" multiple="true" style="min-width: 200px"></select>
</td>
</tr>
{{each(i, ldapGroupMapping) ldapGroupMappings()}}
@@ -1284,8 +1285,9 @@
${ldapGroupMapping.group}
</td>
<td>
- <select id="roles-group-mapping-${ldapGroupMapping.group()}"
data-bind="options: $parent.allRoleNames, selectedOptions:
ldapGroupMapping.roleNames"
- size="5" multiple="true" ></select>
+ <select id="roles-group-mapping-${ldapGroupMapping.group()}"
+ data-bind="options: $parent.allRoleNames, selectedOptions:
ldapGroupMapping.roleNames, select2: { }"
+ size="5" multiple="true" style="min-width: 200px"></select>
</td>
</tr>
{{/each}}
