Only add Id to list of fields to be retrieved if it is not already there

jperezq · Oct 1, 2012 · 4cf5648 · 4cf5648
1 parent 774a837
commit 4cf5648
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/RemoteTKController.cls b/RemoteTKController.cls
@@ -102,13 +102,20 @@ public class RemoteTKController {
 
     @remoteAction
     public static String retrieve(String objtype, String id, String fieldlist) {
-        // TODO - handle missing fieldlist - retrieve all fields
-        String fieldString = '';
+        // TODO - handle null fieldlist - retrieve all fields
+        Boolean containsId = false;
         for (String field : fieldlist.split(',')) {
-            fieldString += ','+field;
+            if (field.equalsIgnoreCase('id')){
+                containsId = true;
+                break;
+            }
+        }
+
+        if (!containsId) {
+            fieldlist = 'Id,'+fieldlist;
         }
 
-        String soql = 'SELECT Id'+fieldString+' FROM '+objtype+' WHERE Id = \''+id+'\'';
+        String soql = 'SELECT '+fieldlist+' FROM '+objtype+' WHERE Id = \''+id+'\'';
         List<sObject> records;
         try {
             records = Database.query(soql);