adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.relationship.php

Indentation +40 added lines, -40 removed lines

@@ -47,16 +47,16 @@ 
 class ViewRelationship extends SugarView
 {
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
     function overrideDefinitionFromPOST(
@@ -66,9 +66,9 @@ 
         require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
         foreach ( AbstractRelationship::$definitionKeys as $key )
         {
-        	if(!empty($_REQUEST ['ajaxLoad']) && in_array($key, array('label', 'rhs_label', 'lhs_label')) ){
-        		continue;
-        	}
+            if(!empty($_REQUEST ['ajaxLoad']) && in_array($key, array('label', 'rhs_label', 'lhs_label')) ){
+                continue;
+            }
             if (! empty ( $_REQUEST [ $key ] ))
             {
                 $definition [ $key ] = $_REQUEST [ $key ] ;
@@ -92,15 +92,15 @@ 
             $fields = $module->fields ;
             require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
             $relatableModules = DeployedRelationships::findRelatableModules () ;
-        	$appStrings = return_app_list_strings_language( $selected_lang ) ;
-        	$modStrings = return_module_language( $selected_lang, $_REQUEST [ 'view_module' ], true ) ;
-        	$appStrings = $appStrings['moduleList'];
+            $appStrings = return_app_list_strings_language( $selected_lang ) ;
+            $modStrings = return_module_language( $selected_lang, $_REQUEST [ 'view_module' ], true ) ;
+            $appStrings = $appStrings['moduleList'];
         } else
         {
             $mb = new ModuleBuilder ( ) ;
-			$mb->getPackages();
-			//display the latest module name rather than what is in or not in the loaded app_list_strings.
-			$mb->getPackage($_REQUEST ['view_package'])->loadModuleTitles();
+            $mb->getPackages();
+            //display the latest module name rather than what is in or not in the loaded app_list_strings.
+            $mb->getPackage($_REQUEST ['view_package'])->loadModuleTitles();
             $module = $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $_REQUEST [ 'view_module' ] ) ;
             $moduleName = empty($module->key_name) ? $module->getModuleName() : $module->key_name;
             $this->smarty->assign ( 'view_package', $_REQUEST [ 'view_package' ] ) ;
@@ -132,16 +132,16 @@ 
             $relationship->setName($_REQUEST [ 'relationship_name' ] );
             $definition = $relationship->getDefinition();
             if (!$this->fromModuleBuilder){
-        		$modStrings = return_module_language( $selected_lang, $relationship->rhs_module, true ) ;
-	            $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
-	            $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
-	    		$definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
-			}else{
-				#30624
-				if(!empty($_REQUEST['rhs_module'])){
-					$definition['rhs_label'] = $_REQUEST['rhs_module'];
-				}
-			}
+                $modStrings = return_module_language( $selected_lang, $relationship->rhs_module, true ) ;
+                $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
+                $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
+                $definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
+            }else{
+                #30624
+                if(!empty($_REQUEST['rhs_module'])){
+                    $definition['rhs_label'] = $_REQUEST['rhs_module'];
+                }
+            }
         } else
         {
             $definition = array ( ) ;
@@ -156,7 +156,7 @@ 
         
         if (empty($definition ['rhs_label']))
         {
-        	$definition ['rhs_label'] = translate($definition [ 'rhs_module' ]);
+            $definition ['rhs_label'] = translate($definition [ 'rhs_module' ]);
         }
         if (empty($definition ['lhs_label']))
         {
@@ -185,17 +185,17 @@ 
             }
 
             if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Activities') {
-            	$cardinality = array( MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ));
+                $cardinality = array( MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ));
             }
             //Bug 23139, Campaigns module current cannot display custom subpanels, so we need to ban it from any
             //relationships that would require a new subpanel to be shown in Campaigns.
-        	if (isset ($definition['lhs_module']) && $definition['lhs_module'] == 'Campaigns') {
-            	unset ( $cardinality [ MB_MANYTOMANY ] ) ;
-            	unset ( $cardinality [ MB_ONETOMANY ] ) ;
+            if (isset ($definition['lhs_module']) && $definition['lhs_module'] == 'Campaigns') {
+                unset ( $cardinality [ MB_MANYTOMANY ] ) ;
+                unset ( $cardinality [ MB_ONETOMANY ] ) ;
             }
-        	if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Campaigns' && isset($cardinality [ MB_MANYTOMANY ])) {
-            	unset ( $cardinality [ MB_MANYTOMANY ] ) ;
-            	unset ( $cardinality [ MB_MANYTOONE ] );
+            if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Campaigns' && isset($cardinality [ MB_MANYTOMANY ])) {
+                unset ( $cardinality [ MB_MANYTOMANY ] ) ;
+                unset ( $cardinality [ MB_MANYTOONE ] );
             }
             if (! isset($cardinality[$relationship->getType()]))
             {
@@ -206,12 +206,12 @@ 
             
             $this->smarty->assign ( 'is_new', true ) ;
         } else {
-        	$this->smarty->assign ( 'is_new', false ) ;
+            $this->smarty->assign ( 'is_new', false ) ;
         }
         
         //Remove Activities if one-to-many is not availible
-    	if (!isset($cardinality [ MB_ONETOMANY ]) && isset ($relatableModules['Activities'])) {
-        	unset ($relatableModules['Activities']);
+        if (!isset($cardinality [ MB_ONETOMANY ]) && isset ($relatableModules['Activities'])) {
+            unset ($relatableModules['Activities']);
         }
         
         
@@ -237,7 +237,7 @@ 
         $this->smarty->assign ( 'rhspanels', $rhs_subpanels ) ;
         $this->smarty->assign ( 'lhspanels', $lhs_subpanels ) ;
         $this->smarty->assign('selected_lang', $selected_lang);
-		$this->smarty->assign('available_languages',get_languages());
+        $this->smarty->assign('available_languages',get_languages());
         
         switch ( $relationship->relationship_type)
         {

modules/ModuleBuilder/views/view.dropdowns.php

Indentation +27 added lines, -27 removed lines

@@ -41,31 +41,31 @@ 
 
 class ViewDropdowns extends SugarView
 {
- 	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+        /**
+         * @see SugarView::_getModuleTitleParams()
+         */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
- 	{
-		$ajax = new AjaxCompose();
-		$smarty = new Sugar_Smarty();
+    function display()
+        {
+        $ajax = new AjaxCompose();
+        $smarty = new Sugar_Smarty();
 		
- 		if (isset($_REQUEST['refreshTree']))
-		{
-			require_once ('modules/ModuleBuilder/Module/DropDownTree.php');
-			$mbt = new DropDownTree();
-			$ajax->addSection('west', $mbt->getName(), $mbt->fetchNodes());
-			$smarty->assign('refreshTree',true);
-		}
+            if (isset($_REQUEST['refreshTree']))
+        {
+            require_once ('modules/ModuleBuilder/Module/DropDownTree.php');
+            $mbt = new DropDownTree();
+            $ajax->addSection('west', $mbt->getName(), $mbt->fetchNodes());
+            $smarty->assign('refreshTree',true);
+        }
                 
         global $mod_strings;
         $ajax->addCrumb($mod_strings['LBL_DROPDOWNEDITOR'], 'ModuleBuilder.main("dropdowns")');
@@ -75,12 +75,12 @@ 
         
         $smarty->assign('LBL_BTN_ADDDROPDOWN',translate('LBL_BTN_ADDDROPDOWN'));
         $smarty->assign('dropdowns', $dd->getNodes());
-		$smarty->assign('deleteImage', SugarThemeRegistry::current()->getImage( 'delete_inline', '',null,null,'.gif',$mod_strings['LBL_MB_DELETE']));
-		$smarty->assign('editImage', SugarThemeRegistry::current()->getImage( 'edit_inline', '',null,null,'.gif',$mod_strings['LBL_EDIT']));
-		$smarty->assign('action', 'savedropdown');
+        $smarty->assign('deleteImage', SugarThemeRegistry::current()->getImage( 'delete_inline', '',null,null,'.gif',$mod_strings['LBL_MB_DELETE']));
+        $smarty->assign('editImage', SugarThemeRegistry::current()->getImage( 'edit_inline', '',null,null,'.gif',$mod_strings['LBL_EDIT']));
+        $smarty->assign('action', 'savedropdown');
 		
 
-		$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR'], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdowns.tpl') );
- 		echo $ajax->getJavascript();
- 	}
+        $ajax->addSection('center', $GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR'], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdowns.tpl') );
+            echo $ajax->getJavascript();
+        }
 }
\ No newline at end of file

modules/ModuleBuilder/views/view.popupview.php

Indentation +18 added lines, -18 removed lines

@@ -62,16 +62,16 @@ 
     }
     
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
 //    /*
@@ -101,12 +101,12 @@ 
 
         if ($preview)
         {
-        	echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
+            echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
         } else
         {
-        	$ajax = $this->constructAjax () ;
-        	$ajax->addSection ( 'center', translate('LBL_POPUP'), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
-        	echo $ajax->getJavascript () ;
+            $ajax = $this->constructAjax () ;
+            $ajax->addSection ( 'center', translate('LBL_POPUP'), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
+            echo $ajax->getJavascript () ;
         }
     }
 
@@ -151,11 +151,11 @@ 
         $helpName = (isset( $_REQUEST['view']) && $_REQUEST['view']==MB_POPUPSEARCH) ? 'searchViewEditor' : 'popupListViewEditor';
         $smarty->assign ( 'helpName', $helpName ) ;
         $smarty->assign ( 'helpDefault', 'modify' ) ;
-   	 	if ($this->fromModuleBuilder) {
-			$mb = new ModuleBuilder ( ) ;
+            if ($this->fromModuleBuilder) {
+            $mb = new ModuleBuilder ( ) ;
             $module = & $mb->getPackageModule ( $this->editPackage, $this->editModule ) ;
-		    $smarty->assign('current_mod_strings', $module->getModStrings());
-		}
+            $smarty->assign('current_mod_strings', $module->getModStrings());
+        }
 
         $smarty->assign ( 'title', $this->_constructTitle () ) ;
         $groups = array ( ) ;
@@ -171,7 +171,7 @@ 
                 {
                     if (substr ( $field [ 'width' ], - 1, 1 ) == '%')
                     {
-						$groups [ $groupKey ] [ $fieldKey ] [ 'width' ] = substr ( $field [ 'width' ], 0, strlen ( $field [ 'width' ] ) - 1 ) ;
+                        $groups [ $groupKey ] [ $fieldKey ] [ 'width' ] = substr ( $field [ 'width' ], 0, strlen ( $field [ 'width' ] ) - 1 ) ;
                     }
                 }
             }

modules/ModuleBuilder/views/view.property.php

Indentation +16 added lines, -16 removed lines

@@ -49,16 +49,16 @@ 
     }
     
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
 	
@@ -97,12 +97,12 @@ 
                 $this->properties[substr($key,6)]['title'] = $value;
             }
         }
-     }
+        }
 
     function display()
     {
         global $mod_strings;
-    	$ajax = new AjaxCompose();
+        $ajax = new AjaxCompose();
         $smarty = new Sugar_Smarty();
         if (isset($_REQUEST['MB']) && $_REQUEST['MB'] == "1")
         {
@@ -111,11 +111,11 @@ 
         }
 
         $selected_lang = (!empty($_REQUEST['selected_lang'])?$_REQUEST['selected_lang']:$_SESSION['authenticated_user_language']);
-		if(empty($selected_lang)){
-		    $selected_lang = $GLOBALS['sugar_config']['default_language'];
-		}
-		$smarty->assign('available_languages', get_languages());
-		$smarty->assign('selected_lang', $selected_lang);
+        if(empty($selected_lang)){
+            $selected_lang = $GLOBALS['sugar_config']['default_language'];
+        }
+        $smarty->assign('available_languages', get_languages());
+        $smarty->assign('selected_lang', $selected_lang);
 		
         ksort($this->properties);
 

modules/ModuleBuilder/views/view.tree.php

Indentation +30 added lines, -30 removed lines

@@ -45,40 +45,40 @@
 
 class ViewHistory extends SugarView 
 {
- 	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+        /**
+         * @see SugarView::_getModuleTitleParams()
+         */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	//STUDIO LABELS ONLY//
- 	//TODO Bundle Studio and ModuleBuilder label handling to increase maintainability.
- 	function display()
- 	{
-		$root = new ExtNode('root', 'root', true);
-		$sb = new StudioBrowser();
-		$sb->loadModules();
-		foreach($sb->modules as $name => $studioMod) {
-			$root->add_node($this->buildStudioNode($studioMod));
-		}
-		$json = getJSONobj();
-		echo($json->encode($root));
- 	}
+    //STUDIO LABELS ONLY//
+        //TODO Bundle Studio and ModuleBuilder label handling to increase maintainability.
+        function display()
+        {
+        $root = new ExtNode('root', 'root', true);
+        $sb = new StudioBrowser();
+        $sb->loadModules();
+        foreach($sb->modules as $name => $studioMod) {
+            $root->add_node($this->buildStudioNode($studioMod));
+        }
+        $json = getJSONobj();
+        echo($json->encode($root));
+        }
 	
-	/**
-	 * 
-	 * @return ExtNode built from the passed StudioModule
-	 * @param $module StudioModule
-	 */
-	function buildStudioNode($module) {
+    /**
+     * 
+     * @return ExtNode built from the passed StudioModule
+     * @param $module StudioModule
+     */
+    function buildStudioNode($module) {
 		
-	}
+    }
 
 }

modules/ModuleBuilder/views/view.resetmodule.php

Indentation +31 added lines, -31 removed lines

@@ -48,19 +48,19 @@ 
 class ViewResetmodule extends SugarView
 {
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
+    function display()
     {
         $moduleName = $this->module = $_REQUEST['view_module'];
         if (isset($_REQUEST['handle']) && $_REQUEST['handle'] == "execute") {
@@ -79,7 +79,7 @@ 
             array("name" => "fields", "label" => translate("LBL_REMOVE_FIELDS")),
             array("name" => "layouts", "label" => translate("LBL_RESET_LAYOUTS")),
             array("name" => "labels", "label" => translate("LBL_RESET_LABELS")),
-			array("name" => "extensions", "label" => translate("LBL_CLEAR_EXTENSIONS")),
+            array("name" => "extensions", "label" => translate("LBL_CLEAR_EXTENSIONS")),
         ));
         
         $ajax->addSection ( 
@@ -104,10 +104,10 @@ 
         if (!empty($_REQUEST['layouts']))
             $out .= $this->removeCustomLayouts();
 			
-		if (!empty($_REQUEST['labels']))
+        if (!empty($_REQUEST['labels']))
             $out .= $this->removeCustomLabels();
 			
-		if (!empty($_REQUEST['extensions']))
+        if (!empty($_REQUEST['extensions']))
             $out .= $this->removeCustomExtensions();	
 			
         
@@ -148,11 +148,11 @@ 
         $customFields = array();
         foreach($seed->field_defs as $def) {
             if(isset($def['source']) && $def['source'] == 'custom_fields') {
-               $field = $df->getFieldWidget($moduleName, $def['name']);
-               $field->delete ( $df ) ;
+                $field = $df->getFieldWidget($moduleName, $def['name']);
+                $field->delete ( $df ) ;
                
-               $module->removeFieldFromLayouts( $def['name'] );
-               $customFields[] = $def['name'];
+                $module->removeFieldFromLayouts( $def['name'] );
+                $customFields[] = $def['name'];
             }
         }
         $out = "";
@@ -196,7 +196,7 @@ 
      */
     function removeCustomRelationships() 
     {
-    	require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
+        require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
         $out = "";
         $madeChanges = false;
         $relationships = new DeployedRelationships ( $this->module ) ;
@@ -210,7 +210,7 @@ 
             }
         }
         if ($madeChanges)
-           $relationships->save () ;
+            $relationships->save () ;
         
         return $out;
     }
@@ -218,33 +218,33 @@ 
     function removeCustomLabels() 
     {
         $out = "";
-		$languageDir = "custom/modules/{$this->module}/language";
+        $languageDir = "custom/modules/{$this->module}/language";
         if (is_dir($languageDir)) {
             $files = scandir($languageDir);
             foreach ($files as $langFile) {
                 if (substr($langFile, 0 ,1) == '.') continue;
-				$language = substr($langFile, 0, strlen($langFile) - 9);
-				unlink($languageDir . "/" . $langFile);
+                $language = substr($langFile, 0, strlen($langFile) - 9);
+                unlink($languageDir . "/" . $langFile);
 				
-				LanguageManager::clearLanguageCache ( $this->module, $language ) ;
-				$out .= "Removed language file $langFile<br/>";
+                LanguageManager::clearLanguageCache ( $this->module, $language ) ;
+                $out .= "Removed language file $langFile<br/>";
             }
         }
 		
-		return $out;
+        return $out;
     }
 	
-	function removeCustomExtensions() 
-	{
+    function removeCustomExtensions() 
+    {
         $out = "";
         $extDir = "custom/Extension/modules/{$this->module}";
         if (is_dir($extDir)) {
-        	rmdir_recursive($extDir);
-        	require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
+            rmdir_recursive($extDir);
+            require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
             $rac = new RepairAndClear ( ) ;
             $rac->repairAndClearAll ( array ( 'clearAll' ), array ( $this->module ), true, false ) ;
-			$rac->rebuildExtensions();
-        	$out .= "Cleared extensions for {$this->module}<br/>";
+            $rac->rebuildExtensions();
+            $out .= "Cleared extensions for {$this->module}<br/>";
         }
 		
         return $out;

modules/ModuleBuilder/views/view.package.php

Indentation +99 added lines, -99 removed lines

@@ -41,127 +41,127 @@
 require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
 class Viewpackage extends SugarView
 {
- 	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+        /**
+         * @see SugarView::_getModuleTitleParams()
+         */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
- 		global $mod_strings;
- 		$smarty = new Sugar_Smarty();
- 		$mb = new ModuleBuilder();
- 		//if (!empty($_REQUEST['package'])) {
- 		if (empty($_REQUEST['package']) && empty($_REQUEST['new'])) {
- 			$this->generatePackageButtons($mb->getPackageList());
+    function display()
+    {
+            global $mod_strings;
+            $smarty = new Sugar_Smarty();
+            $mb = new ModuleBuilder();
+            //if (!empty($_REQUEST['package'])) {
+            if (empty($_REQUEST['package']) && empty($_REQUEST['new'])) {
+                $this->generatePackageButtons($mb->getPackageList());
 
- 			$smarty->assign('buttons', $this->buttons);
- 			$smarty->assign('title', $GLOBALS['mod_strings']['LBL_MODULEBUILDER']);
- 			$smarty->assign("question", $GLOBALS['mod_strings']['LBL_QUESTION_PACKAGE']);
- 			$smarty->assign("defaultHelp", "mbHelp");
+                $smarty->assign('buttons', $this->buttons);
+                $smarty->assign('title', $GLOBALS['mod_strings']['LBL_MODULEBUILDER']);
+                $smarty->assign("question", $GLOBALS['mod_strings']['LBL_QUESTION_PACKAGE']);
+                $smarty->assign("defaultHelp", "mbHelp");
 
- 			$ajax = new AjaxCompose();
- 			$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
-			$ajax->addCrumb($GLOBALS['mod_strings']['LBL_PACKAGE_LIST'],'');
- 			$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_PACKAGE_LIST'], $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
-			echo $ajax->getJavascript();
- 		}
- 		else {
+                $ajax = new AjaxCompose();
+                $ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
+            $ajax->addCrumb($GLOBALS['mod_strings']['LBL_PACKAGE_LIST'],'');
+                $ajax->addSection('center', $GLOBALS['mod_strings']['LBL_PACKAGE_LIST'], $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
+            echo $ajax->getJavascript();
+            }
+            else {
  			
- 			$name = (!empty($_REQUEST['package']))?$_REQUEST['package']:'';
-			$mb->getPackage($name);
+                $name = (!empty($_REQUEST['package']))?$_REQUEST['package']:'';
+            $mb->getPackage($name);
 			
             require_once ('modules/ModuleBuilder/MB/MBPackageTree.php') ;
             $mbt = new MBPackageTree();
             $nodes = $mbt->fetchNodes();
             
-			$package_labels = array();
-			if(!empty($nodes['tree_data']['nodes']))
-			{
-				foreach($nodes['tree_data']['nodes'] as $entry) 
-				{
-					if(!empty($entry['data']['label']) && $name != $entry['data']['label'])
-					{
-						$package_labels[] = strtoupper($entry['data']['label']);
-					}
-				}
-			}
+            $package_labels = array();
+            if(!empty($nodes['tree_data']['nodes']))
+            {
+                foreach($nodes['tree_data']['nodes'] as $entry) 
+                {
+                    if(!empty($entry['data']['label']) && $name != $entry['data']['label'])
+                    {
+                        $package_labels[] = strtoupper($entry['data']['label']);
+                    }
+                }
+            }
 			
-			$json = getJSONobj();
-			$smarty->assign('package_labels', $json->encode($package_labels));            	
+            $json = getJSONobj();
+            $smarty->assign('package_labels', $json->encode($package_labels));            	
 			
-	 		$this->package =& $mb->packages[$name];
-	 		$this->loadModuleTypes();
-	 		$this->loadPackageHelp($name);
-	 		$this->package->date_modified = $GLOBALS['timedate']->to_display_date_time($this->package->date_modified);
-	 		$smarty->assign('package', $this->package);
-			$smarty->assign('mod_strings',$mod_strings);
-	 		$smarty->assign('package_already_deployed', 'false');
+                $this->package =& $mb->packages[$name];
+                $this->loadModuleTypes();
+                $this->loadPackageHelp($name);
+                $this->package->date_modified = $GLOBALS['timedate']->to_display_date_time($this->package->date_modified);
+                $smarty->assign('package', $this->package);
+            $smarty->assign('mod_strings',$mod_strings);
+                $smarty->assign('package_already_deployed', 'false');
             foreach($this->package->modules as $a_module){
                 if(in_array($a_module->key_name, $GLOBALS['moduleList'])){
-	 		        $smarty->assign('package_already_deployed', 'true');
+                        $smarty->assign('package_already_deployed', 'true');
                     break;
                 }
             }
 
-	 		$ajax = new AjaxCompose();
-	 		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
-			if(empty($name))$name = $mod_strings['LBL_NEW_PACKAGE'];
-	 		$ajax->addCrumb($name,'');
-	 		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/package.tpl');
-	 		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SavePackage')
-	 			$html.="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
-	 		$ajax->addSection('center', translate('LBL_SECTION_PACKAGE', 'ModuleBuilder'), $html);
-			echo $ajax->getJavascript();
- 		}
- 	}
+                $ajax = new AjaxCompose();
+                $ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
+            if(empty($name))$name = $mod_strings['LBL_NEW_PACKAGE'];
+                $ajax->addCrumb($name,'');
+                $html=$smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/package.tpl');
+                if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SavePackage')
+                    $html.="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+                $ajax->addSection('center', translate('LBL_SECTION_PACKAGE', 'ModuleBuilder'), $html);
+            echo $ajax->getJavascript();
+            }
+        }
 
- 	function loadModuleTypes()
- 	{
- 		$this->package->moduleTypes = array();
- 		$this->package->loadModules();
- 		foreach(array_keys($this->package->modules) as $name){
- 			foreach($this->package->modules[$name]->config['templates'] as $template=>$var){
+        function loadModuleTypes()
+        {
+            $this->package->moduleTypes = array();
+            $this->package->loadModules();
+            foreach(array_keys($this->package->modules) as $name){
+                foreach($this->package->modules[$name]->config['templates'] as $template=>$var){
 
- 					$this->package->moduleTypes[$name] = $template;
+                        $this->package->moduleTypes[$name] = $template;
 
- 			}
- 		}
- 	}
- 	function loadPackageHelp(
- 	    $name
- 	    )
- 	{
- 			$this->package->help['default'] = (empty($name))?'create':'modify';
- 			$this->package->help['group'] = 'package';
- 	}
+                }
+            }
+        }
+        function loadPackageHelp(
+            $name
+            )
+        {
+                $this->package->help['default'] = (empty($name))?'create':'modify';
+                $this->package->help['group'] = 'package';
+        }
 
- 	function generatePackageButtons(
- 	    $packages
- 	    )
- 	{
- 		global $mod_strings;
- 		$this->buttons[$mod_strings['LBL_NEW_PACKAGE']] = array(
- 										'action' => "module=ModuleBuilder&action=package&new=1",
- 										'imageTitle' => 'package_create',
- 										'size' => '64',
-										'help' => 'newPackage',
+        function generatePackageButtons(
+            $packages
+            )
+        {
+            global $mod_strings;
+            $this->buttons[$mod_strings['LBL_NEW_PACKAGE']] = array(
+                                            'action' => "module=ModuleBuilder&action=package&new=1",
+                                            'imageTitle' => 'package_create',
+                                            'size' => '64',
+                                        'help' => 'newPackage',
                                         'linkId' => 'newPackageLink'
- 										);
- 		foreach($packages as $package) {
- 			$this->buttons[$package] = array(
- 										'action' =>"module=ModuleBuilder&action=package&package={$package}",
-										'imageTitle' => 'package',
-										'size' => '64',
- 										);
- 		}
- 	}
+                                            );
+            foreach($packages as $package) {
+                $this->buttons[$package] = array(
+                                            'action' =>"module=ModuleBuilder&action=package&package={$package}",
+                                        'imageTitle' => 'package',
+                                        'size' => '64',
+                                            );
+            }
+        }
 }
\ No newline at end of file

modules/ModuleBuilder/views/view.wizard.php

Indentation +285 added lines, -285 removed lines

@@ -43,301 +43,301 @@
 
 class ModuleBuilderViewWizard extends SugarView
 {
-	private $view = null ; // the wizard view to display
-	private $actions ;
-	private $buttons ;
-	private $question ;
-	private $title ;
-	private $help ;
-
-	private $editModule ;
-
-	function __construct()
-	{
-		if ( isset ( $_REQUEST [ 'view' ] ) )
-			$this->view = $_REQUEST [ 'view' ] ;
-
-		$this->editModule = (! empty ( $_REQUEST [ 'view_module' ] ) ) ? $_REQUEST [ 'view_module' ] : null ;
-		$this->buttons = array(); // initialize so that modules without subpanels for example don't result in this being unset and causing problems in the smarty->assign
-	}
+    private $view = null ; // the wizard view to display
+    private $actions ;
+    private $buttons ;
+    private $question ;
+    private $title ;
+    private $help ;
+
+    private $editModule ;
+
+    function __construct()
+    {
+        if ( isset ( $_REQUEST [ 'view' ] ) )
+            $this->view = $_REQUEST [ 'view' ] ;
+
+        $this->editModule = (! empty ( $_REQUEST [ 'view_module' ] ) ) ? $_REQUEST [ 'view_module' ] : null ;
+        $this->buttons = array(); // initialize so that modules without subpanels for example don't result in this being unset and causing problems in the smarty->assign
+    }
 	
-	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+    /**
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
+    }
+
+    function display()
+    {
+        $this->ajax = new AjaxCompose ( ) ;
+        $smarty = new Sugar_Smarty ( ) ;
+
+        if (isset ( $_REQUEST [ 'MB' ] ))
+        {
+            $this->processMB ( $this->ajax ) ;
+        } else
+        {
+
+                $this->processStudio ( $this->ajax ) ;
+
+        }
+
+        $smarty->assign ( 'buttons', $this->buttons ) ;
+        $smarty->assign ( 'image_path', $GLOBALS [ 'image_path' ] ) ;
+        $smarty->assign ( "title", $this->title ) ;
+        $smarty->assign ( "question", $this->question ) ;
+        $smarty->assign ( "defaultHelp", $this->help ) ;
+        $smarty->assign ( "actions", $this->actions ) ;
+
+        $this->ajax->addSection ( 'center', $this->title, $smarty->fetch ( 'modules/ModuleBuilder/tpls/wizard.tpl' ) ) ;
+        echo $this->ajax->getJavascript () ;
     }
 
-	function display()
-	{
-		$this->ajax = new AjaxCompose ( ) ;
-		$smarty = new Sugar_Smarty ( ) ;
-
-		if (isset ( $_REQUEST [ 'MB' ] ))
-		{
-			$this->processMB ( $this->ajax ) ;
-		} else
-		{
-
-				$this->processStudio ( $this->ajax ) ;
-
-		}
-
-		$smarty->assign ( 'buttons', $this->buttons ) ;
-		$smarty->assign ( 'image_path', $GLOBALS [ 'image_path' ] ) ;
-		$smarty->assign ( "title", $this->title ) ;
-		$smarty->assign ( "question", $this->question ) ;
-		$smarty->assign ( "defaultHelp", $this->help ) ;
-		$smarty->assign ( "actions", $this->actions ) ;
-
-		$this->ajax->addSection ( 'center', $this->title, $smarty->fetch ( 'modules/ModuleBuilder/tpls/wizard.tpl' ) ) ;
-		echo $this->ajax->getJavascript () ;
-	}
-
-	function processStudio( 
-	    $ajax
-	    )
-	{
-
-		$this->ajax->addCrumb ( translate( 'LBL_STUDIO' ), 'ModuleBuilder.main("studio")' ) ;
-
-		if (! isset ( $this->editModule ))
-		{
-			//Studio Select Module Page
-			$this->generateStudioModuleButtons () ;
-			$this->question = translate('LBL_QUESTION_EDIT') ;
-			$this->title = translate( 'LBL_STUDIO' );
-			global $current_user;
-			if (is_admin($current_user))
-				$this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"" . translate ( 'LBL_BTN_EXPORT' ) . '">' ;
-
-			$this->help = 'studioHelp' ;
-		} else
-		{
-			$module = StudioModuleFactory::getStudioModule( $this->editModule ) ;
-			$this->ajax->addCrumb ( $module->name, !empty($this->view) ? 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")' : '' ) ;
-			switch ( $this->view )
-			{
-				case 'layouts':
-					//Studio Select Layout page
-					$this->buttons = $module->getLayouts() ;
-					$this->title = $module->name . " " . translate('LBL_LAYOUTS') ;
-					$this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
-					$this->help = 'layoutsHelp' ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
-					break;
-
-
-				case 'subpanels':
-					//Studio Select Subpanel page.
-					$this->buttons = $module->getSubpanels() ;
-					$this->title = $module->name . " " . translate( 'LBL_SUBPANELS' ) ;
-					$this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
-					$this->help = 'subpanelHelp' ;
-					break;
-
-				case 'search':
-					//Studio Select Search Layout page.
-					$this->buttons = $module->getSearch() ;
-					$this->title = $module->name . " " . translate('LBL_SEARCH');
-					$this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_SEARCH' ), '' ) ;
-					$this->help = 'searchHelp' ;
-					break;
-
-				case 'dashlet':
-					$this->generateStudioDashletButtons();
-					$this->title = $this->editModule ." " .translate('LBL_DASHLET');
-					$this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
-					$this->help = 'dashletHelp' ;
-					break;
+    function processStudio( 
+        $ajax
+        )
+    {
+
+        $this->ajax->addCrumb ( translate( 'LBL_STUDIO' ), 'ModuleBuilder.main("studio")' ) ;
+
+        if (! isset ( $this->editModule ))
+        {
+            //Studio Select Module Page
+            $this->generateStudioModuleButtons () ;
+            $this->question = translate('LBL_QUESTION_EDIT') ;
+            $this->title = translate( 'LBL_STUDIO' );
+            global $current_user;
+            if (is_admin($current_user))
+                $this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"" . translate ( 'LBL_BTN_EXPORT' ) . '">' ;
+
+            $this->help = 'studioHelp' ;
+        } else
+        {
+            $module = StudioModuleFactory::getStudioModule( $this->editModule ) ;
+            $this->ajax->addCrumb ( $module->name, !empty($this->view) ? 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")' : '' ) ;
+            switch ( $this->view )
+            {
+                case 'layouts':
+                    //Studio Select Layout page
+                    $this->buttons = $module->getLayouts() ;
+                    $this->title = $module->name . " " . translate('LBL_LAYOUTS') ;
+                    $this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
+                    $this->help = 'layoutsHelp' ;
+                    $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
+                    break;
+
+
+                case 'subpanels':
+                    //Studio Select Subpanel page.
+                    $this->buttons = $module->getSubpanels() ;
+                    $this->title = $module->name . " " . translate( 'LBL_SUBPANELS' ) ;
+                    $this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
+                    $this->help = 'subpanelHelp' ;
+                    break;
+
+                case 'search':
+                    //Studio Select Search Layout page.
+                    $this->buttons = $module->getSearch() ;
+                    $this->title = $module->name . " " . translate('LBL_SEARCH');
+                    $this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_SEARCH' ), '' ) ;
+                    $this->help = 'searchHelp' ;
+                    break;
+
+                case 'dashlet':
+                    $this->generateStudioDashletButtons();
+                    $this->title = $this->editModule ." " .translate('LBL_DASHLET');
+                    $this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
+                    $this->help = 'dashletHelp' ;
+                    break;
 				
-				case 'popup':
-					$this->generateStudioPopupButtons();
-					$this->title = $this->editModule ." " .translate('LBL_POPUP');
-					$this->question = translate( 'LBL_QUESTION_POPUP' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
-					$this->help = 'popupHelp' ;
-					break;
-				default:
-					//Studio Edit Module Page
-					$this->buttons = $module->getModule () ;
-					$this->question = translate( 'LBL_QUESTION_MODULE' ) ;
-					$this->title = translate( 'LBL_EDIT' ) . " " . $module->name ;
-					$this->help = 'moduleHelp' ;
-					global $current_user;
-					if (is_admin($current_user))
+                case 'popup':
+                    $this->generateStudioPopupButtons();
+                    $this->title = $this->editModule ." " .translate('LBL_POPUP');
+                    $this->question = translate( 'LBL_QUESTION_POPUP' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
+                    $this->help = 'popupHelp' ;
+                    break;
+                default:
+                    //Studio Edit Module Page
+                    $this->buttons = $module->getModule () ;
+                    $this->question = translate( 'LBL_QUESTION_MODULE' ) ;
+                    $this->title = translate( 'LBL_EDIT' ) . " " . $module->name ;
+                    $this->help = 'moduleHelp' ;
+                    global $current_user;
+                    if (is_admin($current_user))
                         $this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" " 
                         . "onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=resetmodule&view_module=$this->editModule');\" value=\"" 
                         . translate( 'LBL_RESET_MODULE' ) . '">' ;
-			}
-		}
-	}
-
-	function processMB ( 
-	    $ajax 
-	    )
-	{
-		if (! isset ( $_REQUEST [ 'view_package' ] ))
-		{
-			sugar_die ( "no ModuleBuilder package set" ) ;
-		}
-
-		$this->editModule = $_REQUEST [ 'view_module' ] ;
-		$this->package = $_REQUEST [ 'view_package' ] ;
-
-		$ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
-		$ajax->addCrumb ( $this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&view_package=' . $this->package . '")' ) ;
-		$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")') ;
-
-		switch ( $this->view )
-		{
-			case 'search':
-				//MB Select Search Layout page.
-				$this->generateMBSearchButtons () ;
-				$this->title = $this->editModule . " " . translate( 'LBL_SEARCH' ) ;
-				$this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
-				$ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
-				$ajax->addCrumb ( translate( 'LBL_SEARCH_FORMS' ), '' ) ;
-				$this->help = "searchHelp" ;
-				break;
-
-			case 'subpanel':
-				//ModuleBuilder Select Subpanel
-				$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
-				$ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
-				$this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
-				$this->help = 'subpanelHelp' ;
-				break;
-
-			case 'dashlet':
-				$this->generateMBDashletButtons ();
-				$this->title = $this->editModule ." " .translate('LBL_DASHLET');
-				$this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
-				$this->help = 'dashletHelp' ;
-				break;
-
-
-			case 'popup':
-				$this->generateMBPopupButtons();
-				$this->title = $this->editModule ." " .translate('LBL_POPUP');
-				$this->question = translate( 'LBL_QUESTION_POPUP' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
-				$this->help = 'popupHelp' ;
-				break;
-			default:
-				$ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
-				$this->generateMBViewButtons () ;
-				$this->title = $this->editModule . " " . translate( 'LBL_LAYOUTS' ) ;
-				$this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
-				$this->help = "layoutsHelp" ;
-		}
-	}
-
-
-	function generateStudioModuleButtons()
-	{
-		require_once ('modules/ModuleBuilder/Module/StudioBrowser.php') ;
-		$sb = new StudioBrowser ( ) ;
-		$sb->loadModules () ;
-		$nodes = $sb->getNodes () ;
-		$this->buttons = array ( ) ;
-		//$GLOBALS['log']->debug(print_r($nodes,true));
-		foreach ( $nodes as $module )
-		{
-			$this->buttons [ $module [ 'name' ] ] = array ( 'action' => $module [ 'action' ] , 'imageTitle' => ucfirst ( $module [ 'module' ] . "_32" ) , 'size' => '32', 'linkId' => 'studiolink_'.$module [ 'module' ] ) ;
-		}
-	}
-
-
-
-	function generateMBViewButtons()
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_EDITVIEW' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_EDITVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'EditView', 
-		      'help'=>'viewBtnEditView'
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DETAILVIEW' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_DETAILVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'DetailView', 
-		      'help'=>'viewBtnListView'  
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_LISTVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'ListView', 
-		      'help'=>'viewBtnListView' 
-		  ) ;
-		  $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_QUICKCREATE' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_QUICKCREATE."&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'QuickCreate', 
-		      'help'=>'viewBtnQuickCreate' 
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_SEARCH' ] ] = 
-		  array (
-		      'action' => "module=ModuleBuilder&MB=true&action=wizard&view=search&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'SearchForm' , 
-		      'help'=> 'searchBtn' 
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DASHLET' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=wizard&view=dashlet&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'Dashlet', 
-		      'help'=>'viewBtnDashlet' 
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] ['LBL_POPUP'] ] = 
-		array ( 
-			'imageTitle' => 'Popup',  
-			'action' => "module=ModuleBuilder&MB=true&action=wizard&view=popup&view_module={$this->editModule}&view_package={$this->package}", 
-			'help'=>'PopupListViewBtn'
-		);  
-	}
-
-	function generateMBDashletButtons() 
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashlet&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashletsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
-	}
+            }
+        }
+    }
+
+    function processMB ( 
+        $ajax 
+        )
+    {
+        if (! isset ( $_REQUEST [ 'view_package' ] ))
+        {
+            sugar_die ( "no ModuleBuilder package set" ) ;
+        }
+
+        $this->editModule = $_REQUEST [ 'view_module' ] ;
+        $this->package = $_REQUEST [ 'view_package' ] ;
+
+        $ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
+        $ajax->addCrumb ( $this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&view_package=' . $this->package . '")' ) ;
+        $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")') ;
+
+        switch ( $this->view )
+        {
+            case 'search':
+                //MB Select Search Layout page.
+                $this->generateMBSearchButtons () ;
+                $this->title = $this->editModule . " " . translate( 'LBL_SEARCH' ) ;
+                $this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
+                $ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
+                $ajax->addCrumb ( translate( 'LBL_SEARCH_FORMS' ), '' ) ;
+                $this->help = "searchHelp" ;
+                break;
+
+            case 'subpanel':
+                //ModuleBuilder Select Subpanel
+                $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
+                $ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
+                $this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
+                $this->help = 'subpanelHelp' ;
+                break;
+
+            case 'dashlet':
+                $this->generateMBDashletButtons ();
+                $this->title = $this->editModule ." " .translate('LBL_DASHLET');
+                $this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
+                $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
+                $this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
+                $this->help = 'dashletHelp' ;
+                break;
+
+
+            case 'popup':
+                $this->generateMBPopupButtons();
+                $this->title = $this->editModule ." " .translate('LBL_POPUP');
+                $this->question = translate( 'LBL_QUESTION_POPUP' ) ;
+                $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
+                $this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
+                $this->help = 'popupHelp' ;
+                break;
+            default:
+                $ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
+                $this->generateMBViewButtons () ;
+                $this->title = $this->editModule . " " . translate( 'LBL_LAYOUTS' ) ;
+                $this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
+                $this->help = "layoutsHelp" ;
+        }
+    }
+
+
+    function generateStudioModuleButtons()
+    {
+        require_once ('modules/ModuleBuilder/Module/StudioBrowser.php') ;
+        $sb = new StudioBrowser ( ) ;
+        $sb->loadModules () ;
+        $nodes = $sb->getNodes () ;
+        $this->buttons = array ( ) ;
+        //$GLOBALS['log']->debug(print_r($nodes,true));
+        foreach ( $nodes as $module )
+        {
+            $this->buttons [ $module [ 'name' ] ] = array ( 'action' => $module [ 'action' ] , 'imageTitle' => ucfirst ( $module [ 'module' ] . "_32" ) , 'size' => '32', 'linkId' => 'studiolink_'.$module [ 'module' ] ) ;
+        }
+    }
+
+
+
+    function generateMBViewButtons()
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_EDITVIEW' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_EDITVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'EditView', 
+                'help'=>'viewBtnEditView'
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DETAILVIEW' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_DETAILVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'DetailView', 
+                'help'=>'viewBtnListView'  
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_LISTVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'ListView', 
+                'help'=>'viewBtnListView' 
+            ) ;
+            $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_QUICKCREATE' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_QUICKCREATE."&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'QuickCreate', 
+                'help'=>'viewBtnQuickCreate' 
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_SEARCH' ] ] = 
+            array (
+                'action' => "module=ModuleBuilder&MB=true&action=wizard&view=search&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'SearchForm' , 
+                'help'=> 'searchBtn' 
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DASHLET' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=wizard&view=dashlet&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'Dashlet', 
+                'help'=>'viewBtnDashlet' 
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] ['LBL_POPUP'] ] = 
+        array ( 
+            'imageTitle' => 'Popup',  
+            'action' => "module=ModuleBuilder&MB=true&action=wizard&view=popup&view_module={$this->editModule}&view_package={$this->package}", 
+            'help'=>'PopupListViewBtn'
+        );  
+    }
+
+    function generateMBDashletButtons() 
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashlet&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashletsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
+    }
 	
-	function generateMBPopupButtons() 
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
-	}
+    function generateMBPopupButtons() 
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
+    }
 	
-	function generateStudioDashletButtons() 
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashlet&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashletsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
-	}
+    function generateStudioDashletButtons() 
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashlet&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashletsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
+    }
 	
-	function generateStudioPopupButtons()
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
-	}
+    function generateStudioPopupButtons()
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
+    }
 	
-	function generateMBSearchButtons()
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=basic_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC_SEARCH' ] , 'imageName' => 'BasicSearch','help' => "BasicSearchBtn" ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=advanced_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED_SEARCH' ] , 'imageName' => 'AdvancedSearch','help' => "AdvancedSearchBtn" ) ;
-	}
+    function generateMBSearchButtons()
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=basic_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC_SEARCH' ] , 'imageName' => 'BasicSearch','help' => "BasicSearchBtn" ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=advanced_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED_SEARCH' ] , 'imageName' => 'AdvancedSearch','help' => "AdvancedSearchBtn" ) ;
+    }
 }

modules/ModuleBuilder/views/view.relationships.php

Indentation +25 added lines, -25 removed lines

@@ -46,16 +46,16 @@ 
 class ViewRelationships extends SugarView
 {
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
     function display()
@@ -69,7 +69,7 @@ 
 
         $ajax = new AjaxCompose ( ) ;
         $json = getJSONobj () ;
-		$this->fromModuleBuilder = !empty ( $_REQUEST [ 'MB' ] ) || (!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio') ;
+        $this->fromModuleBuilder = !empty ( $_REQUEST [ 'MB' ] ) || (!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio') ;
         $smarty->assign('fromModuleBuilder', $this->fromModuleBuilder);
         if (!$this->fromModuleBuilder)
         {
@@ -97,7 +97,7 @@ 
             $mb = new ModuleBuilder ( ) ;
             $module = & $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $_REQUEST [ 'view_module' ] ) ;
             $package = $mb->packages [ $_REQUEST [ 'view_package' ] ] ;
-			$package->loadModuleTitles();
+            $package->loadModuleTitles();
             $relationships = new UndeployedRelationships ( $module->getModuleDir () ) ;
             $ajaxRelationships = $this->getAjaxRelationships( $relationships ) ;
             $smarty->assign ( 'relationships', $json->encode ( $ajaxRelationships ) ) ;
@@ -129,23 +129,23 @@ 
             
             //#28668  , translate the relationship type before render it .
             switch($rel['relationship_type']){
-            	case 'one-to-one':
-            	$rel['relationship_type']  = translate ( 'LBL_ONETOONE' );
-            	break;
-            	case 'one-to-many':
-            	$rel['relationship_type']  = translate ( 'LBL_ONETOMANY' );
-            	break;
-            	case 'many-to-one':
-            	$rel['relationship_type']  = translate ( 'LBL_MANYTOONE' );
-            	break;
-            	case 'many-to-many':
-            	$rel['relationship_type']  = translate ( 'LBL_MANYTOMANY' );
-            	break;
-            	default: $rel['relationship_type']  = '';
+                case 'one-to-one':
+                $rel['relationship_type']  = translate ( 'LBL_ONETOONE' );
+                break;
+                case 'one-to-many':
+                $rel['relationship_type']  = translate ( 'LBL_ONETOMANY' );
+                break;
+                case 'many-to-one':
+                $rel['relationship_type']  = translate ( 'LBL_MANYTOONE' );
+                break;
+                case 'many-to-many':
+                $rel['relationship_type']  = translate ( 'LBL_MANYTOMANY' );
+                break;
+                default: $rel['relationship_type']  = '';
             }
             $rel [ 'name' ] = $relationshipName ;
             if ($rel [ 'is_custom' ] && isset($rel [ 'from_studio' ]) && $rel [ 'from_studio' ]) {
-            	$rel [ 'name' ] = $relationshipName . "*";
+                $rel [ 'name' ] = $relationshipName . "*";
             }
             $ajaxrels [] = $rel ;
         }