Merge branch 'master' of https://github.com/Sage/argos-sdk

Sage · Nov 14, 2012 · 8d9cfba · 8d9cfba
2 parents 9581890 + 095dd5c
commit 8d9cfba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Gobi Platform SDK
+Argos SDK
 =================
 
 Installation
@@ -15,9 +15,9 @@ Installation
 
 		mkdir sage\mobile\products (or "mkdir -p sage\mobile\products" from Git Bash)
 		cd sage\mobile
-		git clone git@github.com:SageScottsdalePlatform/argos-sdk.git
+		git clone git@github.com:Sage/argos-sdk.git
 
-__Note:__ If you're downloading the source zip file instead of using git directly, the net of the above is that you will want to establish a root folder for the argos projects (in our case, we used "mobile"). Put argos-sdk in that root folder, and any product-specific projects (such as argos-saleslogix) under a products sub-folder. When you download and extract the zip file, you will probably have a top-level folder named something like "SageScottsdalePlatform-argos-sdk-nnnnn". It is this folder that you will want to rename to "argos-sdk".
+__Note:__ If you're downloading the source zip file instead of using git directly, the net of the above is that you will want to establish a root folder for the argos projects (in our case, we used "mobile"). Put argos-sdk in that root folder, and any product-specific projects (such as argos-saleslogix) under a products sub-folder. When you download and extract the zip file, you will probably have a top-level folder named something like "Sage-argos-sdk-nnnnn". It is this folder that you will want to rename to "argos-sdk".
 
 You should end up with a folder structure like this:
     source\sage\mobile\argos-sdk

diff --git a/src/Store/SData.js b/src/Store/SData.js
@@ -101,16 +101,7 @@ define('argos/Store/SData', [
                 var contractName = utility.expand(this.scope || this, getOptions.contractName || this.contractName),
                     resourceKind = utility.expand(this.scope || this, getOptions.resourceKind || this.resourceKind),
                     resourceProperty = utility.expand(this.scope || this, getOptions.resourceProperty || this.resourceProperty),
-                    resourcePredicate = id
-                        ? typeof id === 'number'
-                            ? id
-                            : /\s+/.test(id) ? id : string.substitute("'${0}'", [id])
-                        : null;
-
-                    // todo: double quotes break some SData providers
-                    // resourcePredicate = id
-                    //    ? /(\s+)/.test(id) ? id : json.stringify(id) /* string keys are quoted, numeric keys are left alone */
-                    //    : utility.expand(this, getOptions.resourcePredicate || this.resourcePredicate);
+                    resourcePredicate = /\s+/.test(id) ? id : string.substitute("'${0}'", [id]);
 
                 if (resourceProperty)
                 {