Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

2014-03-13 12:04:55 +02:00
parent 9c043eacd4 1ae4ac04d6
commit 284bafaadc
3 changed files with 14 additions and 10 deletions
@@ -227,9 +227,9 @@ class Record extends Base
 			if ($this->getRecordService()->linkEntity($id, $link, $foreignId)) {
 				$result = $result || true;
 			}
-			if ($result) {
-				return true;
-			}
+		}
+		if ($result) {
+			return true;
 		}	
 		
 		throw new Error();		
@@ -255,9 +255,9 @@ class Record extends Base
 			if ($this->getRecordService()->unlinkEntity($id, $link, $foreignId)) {
 				$result = $result || true;
 			}
-			if ($result) {
-				return true;
-			}
+		}
+		if ($result) {
+			return true;
 		}	
 		
 		throw new Error();		
@@ -21,12 +21,14 @@
        },
        "thousandSeparator": {
            "type": "varchar",
-            "default": ","
+            "default": ",",
+            "maxLength": 1
        },
        "decimalMark": {
            "type": "varchar",
            "default": ".",
-            "required": true
+            "required": true,
+            "maxLength": 1
        },
        "defaultCurrency": {
            "type": "enum",
@@ -40,12 +40,14 @@
        },
        "thousandSeparator": {
            "type": "varchar",
-            "default": ","
+            "default": ",",
+            "maxLength": 1
        },
        "decimalMark": {
            "type": "varchar",
            "default": ".",
-            "required": true
+            "required": true,
+            "maxLength": 1
        },
        "currencyList": {
            "type": "array",