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/15 09:10:53 UTC
svn commit: r964324 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main:
java/org/apache/clerezza/platform/usermanager/webinterface/
java/org/apache/clerezza/platform/usermanager/webi...
Author: ito
Date: Thu Jul 15 07:10:53 2010
New Revision: 964324
URL: http://svn.apache.org/viewvc?rev=964324&view=rev
Log:
alert message added before deleting users/roles/properties, custom field pages merged into one page
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-property-template.xhtml
Removed:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-multiple-property-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-single-property-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-field-template.xhtml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/ontology/USERMANAGER.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-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-custom-property.js
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-overview.js
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-role-overview.js
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java?rev=964324&r1=964323&r2=964324&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java Thu Jul 15 07:10:53 2010
@@ -184,14 +184,9 @@ public class UserManagerWeb implements G
MediaType.APPLICATION_XHTML_XML_TYPE, true);
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
- "add-single-property-template.xhtml").toURI().toString()),
- USERMANAGER.SingleCustomPropertyPage,"naked",
+ "add-property-template.xhtml").toURI().toString()),
+ USERMANAGER.AddCustomPropertyPage,"naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
- renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
- new UriRef(getClass().getResource(
- "add-multiple-property-template.xhtml").toURI().toString()),
- USERMANAGER.MultipleCustomPropertyPage,
- "naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
renderletManager
.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
@@ -434,7 +429,7 @@ public class UserManagerWeb implements G
ArrayList<NonLiteral> customfields = new ArrayList<NonLiteral>();
- if (roles != "" && roles.trim().length() > 0) {
+ if (!roles.equals("") && roles.trim().length() > 0) {
String[] rolesArray = roles.split(",");
for (int i = 0; i < rolesArray.length; i++) {
NonLiteral collection = customPropertyManager
@@ -917,29 +912,13 @@ public class UserManagerWeb implements G
@GET
- @Path("add-single-property")
+ @Path("add-property")
public GraphNode getAddSinglePropertyPage(
@QueryParam(value = "roleTitle") String role) {
MGraph resultGraph = new SimpleMGraph();
NonLiteral node = new BNode();
resultGraph.add(new TripleImpl(node, RDF.type,
- USERMANAGER.SingleCustomPropertyPage));
- resultGraph.add(new TripleImpl(node, RDF.type,
- PLATFORM.HeadedPage));
-
- resultGraph.add(new TripleImpl(node, USERMANAGER.role,
- new PlainLiteralImpl(role)));
- return new GraphNode(node, resultGraph);
- }
-
- @GET
- @Path("add-multiple-property")
- public GraphNode getAddMultiplePropertyPage(
- @QueryParam(value = "roleTitle") String role) {
- MGraph resultGraph = new SimpleMGraph();
- NonLiteral node = new BNode();
- resultGraph.add(new TripleImpl(node, RDF.type,
- USERMANAGER.MultipleCustomPropertyPage));
+ USERMANAGER.AddCustomPropertyPage));
resultGraph.add(new TripleImpl(node, RDF.type,
PLATFORM.HeadedPage));
@@ -959,7 +938,7 @@ public class UserManagerWeb implements G
UriRef propertyUri = new UriRef(property);
customPropertyManager.addSingleCustomField(PERMISSION.Role, title,
label, propertyUri, length, 1);
- return RedirectUtil.createSeeOtherResponse("list-roles", uriInfo);
+ return RedirectUtil.createSeeOtherResponse("manage-custom-properties?role=" + title, uriInfo);
}
@POST
@@ -975,7 +954,7 @@ public class UserManagerWeb implements G
UriRef propertyUri = new UriRef(property);
customPropertyManager.addMultipleCustomField(PERMISSION.Role, title,
label, propertyUri, multiselect, selectablevalues, 1);
- return RedirectUtil.createSeeOtherResponse("list-roles", uriInfo);
+ return RedirectUtil.createSeeOtherResponse("manage-custom-properties?role=" + title, uriInfo);
}
@POST
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/ontology/USERMANAGER.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/ontology/USERMANAGER.java?rev=964324&r1=964323&r2=964324&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/ontology/USERMANAGER.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/ontology/USERMANAGER.java Thu Jul 15 07:10:53 2010
@@ -61,16 +61,9 @@ public class USERMANAGER {
/**
* * An RDF type denoting that the subject of this type is connected to
- * information needed to present a web page for adding a single customproperty to a role.
+ * information needed to present a web page for adding a customproperty to a role.
*/
- public static final UriRef SingleCustomPropertyPage = new UriRef("http://clerezza.org/2009/05/usermanager#SingleCustomPropertyPage");
-
- /**
- * * An RDF type denoting that the subject of this type is connected to
- * information needed to present a web page for adding a multiple customproperty to a role.
- */
- public static final UriRef MultipleCustomPropertyPage = new UriRef("http://clerezza.org/2009/05/usermanager#MultipleCustomPropertyPage");
-
+ public static final UriRef AddCustomPropertyPage = new UriRef("http://clerezza.org/2009/05/usermanager#AddCustomPropertyPage");
/**
* An RDF type denoting that the subject of this type is connected to
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-property-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-property-template.xhtml?rev=964324&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-property-template.xhtml (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-property-template.xhtml Thu Jul 15 07:10:53 2010
@@ -0,0 +1,121 @@
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
+
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-users">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="list-roles">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-generic" href={"manage-custom-properties?role=" + (res/umr("role")*)}>Back to Custom Fields</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="#">Save</a></li>);
+
+
+ <div id="tx-content">
+ <script type="text/javascript">
+ $(document).ready(function() {{
+ $("#valueoption").val("single value");
+ $("#add-custom-field-form2").hide();
+
+ $("#addButton").bind("click", function() {{
+ if($("#valueoption").val() == "single value") {{
+ $("#add-custom-field-form1").submit();
+ }} else {{
+ $("#add-custom-field-form2").submit();
+ }}
+ }});
+
+ $("#valueoption").change(function () {{
+ if($("#valueoption").val() == "single value") {{
+ $("#add-custom-field-form1").show();
+ $("#add-custom-field-form2").hide();
+ }} else {{
+ $("#add-custom-field-form1").hide();
+ $("#add-custom-field-form2").show();
+ }}
+ }});
+ }});
+ </script>
+
+ <div class="tx-tree">
+ <div class="tx-edit">
+ <h3 class="tx-edit-header">{"Add Custom Field to " + (res/umr("role")*)}</h3>
+ <br/>
+ <form>
+ <fieldset>
+ <ol style="display: block;">
+ <li class="tx-line" style="background-image: none">
+ <label >Select Value Option:</label>
+ <span class="tx-item">
+ <select id="valueoption" size="1">
+ <option>single value</option>
+ <option>multiple values</option>
+ </select>
+ </span>
+ </li>
+ </ol>
+ </fieldset>
+ </form>
+ <br/>
+ <form action="add-single-property" id="add-custom-field-form1" method="post"><fieldset>
+ <input type="hidden" name="title" value={res/umr("role")*} />
+ <ol style="display: block;">
+ <li class="tx-line" style="background-image: none">
+ <label >Property:</label>
+ <span class="tx-item">
+ <input type="text" id="property" name="property" size="30" value=""/> Well-formed URI required (e.g. http://foo.bar)
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Label:</label>
+ <span class="tx-item">
+ <input id="label" name="label" type="text" value="" />
+ </span>
+
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Length:</label>
+ <span class="tx-item">
+ <input id="length" name="length" type="text" value="" /> (e.g. 20)
+ </span>
+ </li>
+ </ol>
+ </fieldset>
+ </form>
+ <form action="add-multiple-property" id="add-custom-field-form2" method="post"><fieldset>
+ <input type="hidden" name="title" value={res/umr("role")*} />
+ <ol style="display: block;">
+
+
+ <li class="tx-line" id="multiselect" style="background-image: none">
+ <label >Select Option:</label>
+ <span class="tx-item">
+ <select name="multiselect" size="1">
+ <option>single</option>
+ <option>multiple</option>
+ </select>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Property:</label>
+ <span class="tx-item">
+ <input id="property" name="property" size="30" type="text" value="" /> Well-formed URI required (e.g. http://foo.bar)
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Label:</label>
+ <span class="tx-item">
+ <input id="label" name="label" type="text" value="" />
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none; height: 6em;">
+ <label >Selectable Values:</label>
+ <span class="tx-item">
+ <textarea cols="20" rows="3" name="selectablevalues"></textarea> Separate values with a comma (,)
+ </span>
+ </li>
+ </ol>
+ </fieldset>
+ </form>
+ </div>
+ </div>
+ </div>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-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/custom-property-template.xhtml?rev=964324&r1=964323&r2=964324&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-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/custom-property-template.xhtml Thu Jul 15 07:10:53 2010
@@ -25,8 +25,7 @@ resultDocModifier.addNodes2Elem("tx-modu
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="backButton" class="tx-button tx-button-generic" href="list-roles">Back to Overview</a></li>);
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-remove" href="#">Delete</a></li>);
-resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addSingleButton" class="tx-button tx-button-create" href="#">Create Single Value Property</a></li>);
-resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addMultipleButton" class="tx-button tx-button-create" href="#">Create Multiple Value Property</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="#">Create Custom Field</a></li>);
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-custom-property.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-custom-property.js?rev=964324&r1=964323&r2=964324&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-custom-property.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-custom-property.js Thu Jul 15 07:10:53 2010
@@ -8,37 +8,42 @@ CustomProperty.initButtons = function()
$("#deleteButton").bind("click", function() {
if(!$(this).hasClass("tx-inactive")){
- var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked")
- var counter = 1;
- activatedCheckBoxes.each(function() {
- var prop = $(this).val();
- var tr = $(this).parent().parent();
- var options = new AjaxOptions("delete-custom-" + counter, "deleting custom property ", function(data) {
- tr.remove();
- });
- options.type = "POST";
- options.url = "./delete-custom-field";
- options.data = {"role": $("table").attr("id"), "property": prop};
- $.ajax(options);
- counter++;
-
- });
+ var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked");
+ var prop = "property";
+ if(activatedCheckBoxes.length > 1) {
+ prop = "properties";
+ }
+ AlertMessage.show(CustomProperty.deleteCustomProperties, "Do you want to delete the selected "+ prop + "?", "Delete Properties");
}
});
- $("#addSingleButton").bind("click", function() {
- document.location = "add-single-property?roleTitle=" + $("table").attr("id");
+ $("#addButton").bind("click", function() {
+ document.location = "add-property?roleTitle=" + $("table").attr("id");
});
- $("#addMultipleButton").bind("click", function() {
- document.location = "add-multiple-property?roleTitle=" + $("table").attr("id");
- });
-
$("input[type=checkbox]").bind("click", function() {
buttonVisibilty();
});
}
+CustomProperty.deleteCustomProperties = function() {
+ var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked");
+ var counter = 1;
+ activatedCheckBoxes.each(function() {
+ var prop = $(this).val();
+ var tr = $(this).parent().parent();
+ var options = new AjaxOptions("delete-custom-" + counter, "deleting custom property ", function(data) {
+ tr.remove();
+ });
+ options.type = "POST";
+ options.url = "./delete-custom-field";
+ options.data = {"role": $("table").attr("id"), "property": prop};
+ $.ajax(options);
+ counter++;
+
+ });
+}
+
function buttonVisibilty() {
var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked").length
if (activatedCheckBoxes == 1) {
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-overview.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-overview.js?rev=964324&r1=964323&r2=964324&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-overview.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-overview.js Thu Jul 15 07:10:53 2010
@@ -9,19 +9,12 @@ UserManager.initButtons = function() {
$("#deleteButton").bind("click", function() {
if(!$(this).hasClass("tx-inactive")){
- var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked")
- var counter = 1;
- activatedCheckBoxes.each(function() {
- var name = $(this).val();
- var options = new AjaxOptions("delete-user-" + counter, "deleting user ", function(data) {
- $("#" + name).remove();
- });
- options.type = "POST";
- options.url = "./delete-user";
- options.data = {"userName": name};
- $.ajax(options);
- counter++;
- });
+ var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked");
+ var user = "user";
+ if(activatedCheckBoxes.length > 1) {
+ user = "users";
+ }
+ AlertMessage.show(UserManager.deleteUsers, "Do you want to delete the selected " + user + "?", "Delete Users");
}
});
$("#editButton").bind("click", function() {
@@ -45,6 +38,22 @@ UserManager.initButtons = function() {
});
}
+UserManager.deleteUsers = function() {
+ var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked")
+ var counter = 1;
+ activatedCheckBoxes.each(function() {
+ var name = $(this).val();
+ var options = new AjaxOptions("delete-user-" + counter, "deleting user ", function(data) {
+ $("#" + name).remove();
+ });
+ options.type = "POST";
+ options.url = "./delete-user";
+ options.data = {"userName": name};
+ $.ajax(options);
+ counter++;
+ });
+}
+
function buttonVisibilty() {
var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked").length
if (activatedCheckBoxes == 1) {
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-role-overview.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-role-overview.js?rev=964324&r1=964323&r2=964324&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-role-overview.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-role-overview.js Thu Jul 15 07:10:53 2010
@@ -8,23 +8,12 @@ RoleManager.initButtons = function() {
$("#deleteButton").bind("click", function() {
if(!$(this).hasClass("tx-inactive")){
- var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked")
- var counter = 1;
- activatedCheckBoxes.each(function() {
- var title = $(this).val();
- if(title != "BasePermissionsRole") {
- var options = new AjaxOptions("delete-role-" + counter, "deleting role ", function(data) {
- $("#" + title).remove();
- });
- options.type = "POST";
- options.url = "./delete-role";
- options.data = {"roleTitle": title};
- $.ajax(options);
- counter++;
- } else {
- AlertMessage.show(undefined, "Could not delete BasePermissionsRole", "Alert", "Ok");
- }
- });
+ var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked");
+ var role = "role";
+ if(activatedCheckBoxes.length > 1) {
+ role = "roles";
+ }
+ AlertMessage.show(RoleManager.deleteRoles, "Do you want to delete the selected " + role + "?", "Delete Roles");
}
});
@@ -54,6 +43,26 @@ RoleManager.initButtons = function() {
});
}
+RoleManager.deleteRoles = function() {
+ var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked")
+ var counter = 1;
+ activatedCheckBoxes.each(function() {
+ var title = $(this).val();
+ if(title != "BasePermissionsRole") {
+ var options = new AjaxOptions("delete-role-" + counter, "deleting role ", function(data) {
+ $("#" + title).remove();
+ });
+ options.type = "POST";
+ options.url = "./delete-role";
+ options.data = {"roleTitle": title};
+ $.ajax(options);
+ counter++;
+ } else {
+ AlertMessage.show(undefined, "Could not delete BasePermissionsRole", "Alert", "Ok");
+ }
+ });
+}
+
function buttonVisibilty() {
var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked").length
if (activatedCheckBoxes == 1) {