You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by it...@apache.org on 2010/07/22 14:38:00 UTC
svn commit: r966623 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface:
./ staticweb/js/
Author: ito
Date: Thu Jul 22 12:37:59 2010
New Revision: 966623
URL: http://svn.apache.org/viewvc?rev=966623&view=rev
Log:
add customfield to user updated to support IE
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml?rev=966623&r1=966622&r2=966623&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml Thu Jul 22 12:37:59 2010
@@ -1,6 +1,8 @@
def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
def dc(s: Any) = new UriRef("http://purl.org/dc/elements/1.1/" + s)
+resultDocModifier.addScriptReference("/scripts/alert-message.js");
+resultDocModifier.addScriptReference("/scripts/ajax-options.js");
resultDocModifier.addScriptReference("js/usermanager.js");
resultDocModifier.setTitle("Users");
@@ -19,8 +21,8 @@ resultDocModifier.addNodes2Elem("tx-cont
refreshCustomInformation(null);
- $("#userRoles option").each(function() {{
- $(this).bind("click", function() {{
+ $("#userRoles").change(function() {{
+ $("#userRoles option:selected").each(function() {{
refreshCustomInformation(null);
}});
}});
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager.js?rev=966623&r1=966622&r2=966623&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager.js (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager.js Thu Jul 22 12:37:59 2010
@@ -1,10 +1,17 @@
function refreshCustomInformation(user){
multipleValues = $("#userRoles").val() || []
+ var options = new AjaxOptions("get-customfields", "retrieving custom fields", function(data) {
+ $("#custominfos").html(data);
+ });
+ options.type = "GET";
+ options.url = "./custom-user";
+ options.dataType = "html";
if(user != null){
- $("#custominfos").load("./custom-user?user="+user+"+&resource=" + document.location.href +"&roles="+multipleValues.join(",")+"&mode=naked");
+ options.data = "user="+user+"+&resource=" + document.location.href +"&roles="+multipleValues.join(",")+"&mode=naked"
} else {
- $("#custominfos").load("./custom-user?resource=" + document.location.href +"&roles="+multipleValues.join(",")+"&mode=naked");
+ options.data = "resource=" + document.location.href +"&roles="+multipleValues.join(",")+"&mode=naked"
}
+ $.ajax(options);
}
function saveUser(){
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml?rev=966623&r1=966622&r2=966623&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml Thu Jul 22 12:37:59 2010
@@ -6,6 +6,8 @@ def dc(s: Any) = new UriRef("http://purl
def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#" + s)
+resultDocModifier.addScriptReference("/scripts/alert-message.js");
+resultDocModifier.addScriptReference("/scripts/ajax-options.js");
resultDocModifier.addScriptReference("js/usermanager.js");
resultDocModifier.setTitle("Users");
@@ -34,9 +36,9 @@ resultDocModifier.addNodes2Elem("tx-cont
refreshCustomInformation({"'" + (res/umr("user")/platform("userName")*) + "'"});
- $("#userRoles option").each(function() {{
- $(this).bind("click", function() {{
- refreshCustomInformation({"'" + (res/umr("user")/platform("userName")*) + "'"});
+ $("#userRoles").change(function() {{
+ $("#userRoles option:selected").each(function() {{
+ refreshCustomInformation(null);
}});
}});
}});