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

2014-01-20 17:03:51 +02:00
parent 27ee03eafa 340170956e
commit 4bbc3b80ed
2 changed files with 6 additions and 11 deletions
@@ -7,26 +7,18 @@ use Espo\Core\Utils\Util;
 class RelationManager
 {
    private $metadata;
-
-    private $relations;
-
+	

 	public function __construct(\Espo\Core\Utils\Metadata $metadata)
 	{
-		$this->metadata = $metadata;
-
-		$this->relations = new Relations($this->metadata);
+		$this->metadata = $metadata;  	  
 	}

 	protected function getMetadata()
 	{
 		return $this->metadata;
-	}
+	} 

-	protected function getRelations()
-	{
-		return $this->relations;
-	}


 	public function getLinkEntityName($entityName, $link)
@@ -21,5 +21,8 @@
   "search":{
      "basic":false,
      "advanced":true
+   },
+   "database":{
+      "notnull":false
   }
 }