Modules generator update

k-samuel · Mar 27, 2016 · 2294c9b · 2294c9b
1 parent f7f63a8
commit 2294c9b
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/dvelum/app/Modules/Generator.php b/dvelum/app/Modules/Generator.php
@@ -73,7 +73,7 @@ public function createVcModule($object , $projectFile)
               $linkedObjects[] = $objectConfig->getLinkedObject($key);
           }
 
-          if(in_array($item['db_type'] , Db_Object_Builder::$textTypes , true) && !$objectConfig->isLink($key))
+          if(in_array($item['db_type'] , Db_Object_Builder::$textTypes , true) || $objectConfig->isObjectLink($key) || $objectConfig->isMultiLink($key))
               continue;
 
           if(isset($item['hidden']) && $item['hidden'])
@@ -297,6 +297,14 @@ public function createVcModule($object , $projectFile)
                     break;
           }
 
+          if($objectConfig->isDictionaryLink($fieldConfig->name)){
+              $dictionary = $objectConfig->getLinkedDictionary($fieldConfig->name);
+              $rendererHelper = new Ext_Helper_Grid_Column_Renderer();
+              $rendererHelper->setType(Ext_Helper_Grid_Column_Renderer::TYPE_DICTIONARY);
+              $rendererHelper->setValue($dictionary);
+              $column->renderer = $rendererHelper;
+          }
+
           $dataGrid->addColumn($column->getName() , $column , $parent = 0);
       }
 
@@ -479,7 +487,7 @@ public function createModule($object , $projectFile)
               $linkedObjects[] = $objectConfig->getLinkedObject($key);
           }
 
-          if(in_array($item['db_type'] , Db_Object_Builder::$textTypes , true) && !$objectConfig->isLink($key))
+          if(in_array($item['db_type'] , Db_Object_Builder::$textTypes , true) || $objectConfig->isObjectLink($key) || $objectConfig->isMultiLink($key))
               continue;
 
           if(isset($item['hidden']) && $item['hidden'])
@@ -651,6 +659,14 @@ public function createModule($object , $projectFile)
               $column->setName($fieldConfig->name);
               $column->itemId = $column->getName();
 
+              if($objectConfig->isDictionaryLink($fieldConfig->name)){
+                  $dictionary = $objectConfig->getLinkedDictionary($fieldConfig->name);
+                  $rendererHelper = new Ext_Helper_Grid_Column_Renderer();
+                  $rendererHelper->setType(Ext_Helper_Grid_Column_Renderer::TYPE_DICTIONARY);
+                  $rendererHelper->setValue($dictionary);
+                  $column->renderer = $rendererHelper;
+              }
+
               $dataGrid->addColumn($column->getName() , $column , $parent = 0);
           }