You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/09/09 12:16:30 UTC

[2/3] git commit: MARMOTTA-249: fixed delete endpoint, and added ui

MARMOTTA-249: fixed delete endpoint, and added ui


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/681a39e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/681a39e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/681a39e1

Branch: refs/heads/develop
Commit: 681a39e13117bcc5183bb0d7e64a172d741a8ee9
Parents: 211ce67
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Sep 9 12:16:06 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Sep 9 12:16:06 2013 +0200

----------------------------------------------------------------------
 .../webservices/prefix/PrefixWebService.java    |  4 ++--
 .../src/main/resources/web/admin/prefixes.html  | 23 +++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/681a39e1/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java
index d76a0a0..740d53d 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java
@@ -32,6 +32,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
 
 import java.net.URISyntaxException;
 import java.util.HashMap;
@@ -95,10 +96,9 @@ public class PrefixWebService {
      */
     @DELETE
     @Path("/" + PREFIX_PATTERN)
-    @Produces("application/json")
     public Response deleteMapping(@PathParam("prefix") String prefix) {
         if (prefixService.remove(prefix)) {
-            return Response.ok().entity(prefix + " deleted").build();
+            return Response.status(Status.NO_CONTENT).build();
         } else {
             return Response.status(Response.Status.NOT_FOUND).entity("prefix " + prefix + " mapping not found").build();
         }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/681a39e1/platform/marmotta-core/src/main/resources/web/admin/prefixes.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/prefixes.html b/platform/marmotta-core/src/main/resources/web/admin/prefixes.html
index 65ae361..cdbe6f2 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/prefixes.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/prefixes.html
@@ -36,6 +36,7 @@
       <tr>
         <th>Prefix</th>
         <th>Namespace</th>
+        <th>&nbsp;</th>
       </tr>
     </table>
     
@@ -59,13 +60,33 @@
         jQuery(document).ready(function() {
 
             function appendPrefix(prefix, namespace) {
-            	$("table#prefixes  > tbody:last").append("<tr><td>" + prefix + "</td><td><a href=\"" + namespace + "\">" + namespace + "</a></td></tr>");
+            	$("table#prefixes  > tbody:last").append("<tr id=\"prefix-" + prefix + "\"><td>" + prefix + "</td><td><a href=\"" + namespace + "\">" + namespace + "</a></td><td><a href=\"#\" class=\"deletePrefix\">delete</a></td></tr>");
             }
             
+            function deletePrefix(prefix) {
+            	$.ajax({
+            	    url: "../../prefix/" + prefix,
+            	    type: "DELETE",	
+            	    dataType: "text",
+            	    statusCode: {
+            	       204: function() {
+		   	        	    	alert("Prefix " + prefix + " deleted!");
+			        	        $("tr#prefix-" + prefix).remove();
+            	          	}
+            	    }
+            	});
+            }              
+            
             $.getJSON("../../prefix", function(data) {
                 $.each(data, function(prefix, namespace) {
                 	appendPrefix(prefix, namespace);
                 });
+                $("a.deletePrefix").click(function() {
+                    var row = $(this).closest("td").closest("tr");
+                    var prefix = row.find("td:first").text();
+                    deletePrefix(prefix);
+                    return false;	
+                });                
             });
 
             $("#add-new-prefix-button").click(function() {