fixed console problem editing or deleting a doc with a custom ID

sidiabale · May 30, 2015 · 5f4bbfb · 5f4bbfb
1 parent 1dd08b3
commit 5f4bbfb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/public/console/bbjs/baasboxgui.js b/public/console/bbjs/baasboxgui.js
@@ -53,6 +53,7 @@ var settingPushDataArray;
 var refreshSessionToken;
 var settingPushMap = {};
 
+var DOC_CLASS_SEPARATOR = "___@___";
 
 $(document).ready(function(){
 	setup();
@@ -315,8 +316,8 @@ $(".btn-action").live("click", function() {
 			break;
 		case "document":
 			//in this case the parameter is pair ID/COLLECTION
-			var id=parameters.substring(0,36);
-			var collection=parameters.substr(36);
+			var id=parameters.substring(0,parameters.indexOf(DOC_CLASS_SEPARATOR));
+			var collection=parameters.substr(parameters.indexOf(DOC_CLASS_SEPARATOR) + DOC_CLASS_SEPARATOR.length);
 			openDocumentEditForm(id,collection);
 			break;
 		case "asset":
@@ -365,8 +366,8 @@ $(".btn-action").live("click", function() {
 			break;
 		case "document":
 		//in this case the parameter is pair ID/COLLECTION
-			var id=parameters.substring(0,36);
-			var collection=parameters.substr(36);
+			var id=parameters.substring(0,parameters.indexOf(DOC_CLASS_SEPARATOR));
+			var collection=parameters.substr(parameters.indexOf(DOC_CLASS_SEPARATOR) + DOC_CLASS_SEPARATOR.length);
 			if(!confirm("Are you sure you want to delete the '"+ id +"' document of the collection '"+collection+"' ?"))
 				return;
 			deleteDocument(collection,id);

diff --git a/public/console/bbjs/documents-datatable.js b/public/console/bbjs/documents-datatable.js
@@ -37,7 +37,7 @@ var documentDataArray= new Array();
 			               },
 			               {"mData": "id","mRender": function ( data, type, full ) {
 							   var obj=JSON.parse(JSON.stringify(full));
-			            	   return getActionButton("edit","document",data + obj["@class"]) + "&nbsp;" + getActionButton("delete","document",data+obj["@class"]) /*+ "&nbsp;" + getActionButton("acl","document",data+obj["@class"])*/;
+			            	   return getActionButton("edit","document",data + DOC_CLASS_SEPARATOR + obj["@class"]) + "&nbsp;" + getActionButton("delete","document",data + DOC_CLASS_SEPARATOR + obj["@class"]) /*+ "&nbsp;" + getActionButton("acl","document",data+obj["@class"])*/;
 			            	},bSortable:false,bSearchable:false
 			               }
 			               ],