Merge branch 'hotfix-7.3.2' into 7.4rc

Conflicts: themes/SuiteR/tpls/_headerModuleList.tpl
salesagility · Oct 19, 2015 · 9e59c99 · 9e59c99
2 parents 84955dc + cce722e
commit 9e59c99
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 42 deletions.
diff --git a/include/SugarObjects/templates/basic/Dashlets/Dashlet/m-n-Dashlet.php b/include/SugarObjects/templates/basic/Dashlets/Dashlet/m-n-Dashlet.php
@@ -50,11 +50,11 @@
 require_once('modules/<module_name>/<object_name>.php');
 
 class <module_name>Dashlet extends DashletGeneric { 
-    function <module_name>Dashlet($id, $def = null) {
+    function __construct($id, $def = null) {
 		global $current_user, $app_strings;
 		require('modules/<module_name>/metadata/dashletviewdefs.php');
 
-        parent::DashletGeneric($id, $def);
+        parent::__construct($id, $def);
 
         if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', '<module_name>');
 

diff --git a/include/SugarObjects/templates/file/views/view.edit.php b/include/SugarObjects/templates/file/views/view.edit.php
@@ -46,8 +46,8 @@
  ********************************************************************************/
 
 class <module_name>ViewEdit extends ViewEdit{
- 	function <module_name>ViewEdit(){
- 		parent::ViewEdit();
+ 	function __construct(){
+ 		parent::__construct();
  	}
  	function display(){
 		if (isset($this->bean->id)) {

diff --git a/modules/AOR_Reports/AOR_Report.php b/modules/AOR_Reports/AOR_Report.php
@@ -653,6 +653,7 @@ function build_report_query_select($query = array(), $group_value =''){
 
                 $field_module = $module;
                 $table_alias = $field_module->table_name;
+                $oldAlias = $table_alias;
                 if(!empty($path[0]) && $path[0] != $module->module_dir){
                     foreach($path as $rel){
                         $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$rel)];
@@ -820,6 +821,7 @@ function build_report_query_where($query = array()){
 
                 $condition_module = $module;
                 $table_alias = $condition_module->table_name;
+                $oldAlias = $table_alias;
                 if(!empty($path[0]) && $path[0] != $module->module_dir){
                     foreach($path as $rel){
                         if(empty($rel)){
@@ -849,12 +851,11 @@ function build_report_query_where($query = array()){
                         $data = $data_new;
                     }
 
-                    if ($data['type'] == 'link' && $data['source'] == 'non-db') {
-                        $relModule = getRelatedModule($condition_module->module_dir, $data['relationship']);
-                        $new_field_module = new $beanList[$relModule];
-                        $query = $this->build_report_query_join($data['relationship'], $table_alias . ':' . strtolower($relModule), $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
-                        $field_module = $new_field_module;
-                        $table_alias = $table_alias . ':' . $data['relationship'];
+                    if($data['type'] == 'link' && $data['source'] == 'non-db') {
+                        $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir,$data['relationship'])];
+                        $table_alias = $data['relationship'];
+                        $query = $this->build_report_query_join($data['relationship'],$table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
+                        $condition_module = $new_field_module;
 
                         // Debugging: security groups conditions - It's a hack to just get the query working
                         if($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
@@ -892,11 +893,11 @@ function build_report_query_where($query = array()){
                             }
 
                             if ($data['type'] == 'link' && $data['source'] == 'non-db') {
-                                $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $data['relationship'])];
-                                $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
-                                $field_module = $new_field_module;
+                                $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir, $data['relationship'])];
                                 $table_alias = $data['relationship'];
-                                $field->field = 'id';
+                                $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
+                                $condition_module = $new_field_module;
+                                $condition->field = 'id';
                             }
                             if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
                                 $value = $condition_module->table_name . '_cstm.' . $condition->value;

diff --git a/modules/ModuleBuilder/tpls/MBModule/Class.tpl b/modules/ModuleBuilder/tpls/MBModule/Class.tpl
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -54,11 +54,13 @@ class {{$class.name}}_sugar extends {{$class.extends}} {
 	var $table_name = '{{$class.table_name}}';
 	var $importable = {{if $class.importable}}true{{else}}false{{/if}};
 	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+
 	{{foreach from=$class.fields key='field' item='def'}}
-	var ${{$field}};
+var ${{$field}};
 	{{/foreach}}
-	function {{$class.name}}_sugar(){	
-		parent::{{$class.extends}}();
+
+	function __construct(){
+		parent::__construct();
 	}
 
 	{{if $class.acl}}
@@ -67,7 +69,7 @@ function bean_implements($interface){
 			case 'ACL': return true;
 		}
 		return false;
-}
+	}
 	{{/if}}
 
 }

diff --git a/modules/ModuleBuilder/tpls/MBModule/DeveloperClass.tpl b/modules/ModuleBuilder/tpls/MBModule/DeveloperClass.tpl
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,8 +43,8 @@
 require_once('modules/{{$class.name}}/{{$class.name}}_sugar.php');
 class {{$class.name}} extends {{$class.name}}_sugar {
 	
-	function {{$class.name}}(){	
-		parent::{{$class.name}}_sugar();
+	function __construct(){
+		parent::__construct();
 	}
 
 }

diff --git a/themes/SuiteR/tpls/_headerModuleList.tpl b/themes/SuiteR/tpls/_headerModuleList.tpl
@@ -364,26 +364,26 @@
         <div class="collapse navbar-collapse hidden-lg hidden-md" id="mobile_menu">
             {foreach from=$groupTabs item=modules key=group name=groupList}
                 {if $smarty.foreach.groupList.last}
-                    {capture name=extraparams assign=extraparams}parentTab={$group}{/capture}
-                    {foreach from=$modules.modules item=module key=modulekey}
-                        {if $modulekey !='Home'}
-                            <li style="float:right;">
-                                <a href="{sugar_link module=$modulekey action='EditView' link_only=1}"><span class="glyphicon glyphicon-plus"></span></a>
-                            </li>
-                        {/if}
-                        <li>
-                            {capture name=moduleTabId assign=moduleTabId}moduleTab_{$smarty.foreach.moduleList.index}_{$module}{/capture}
-                            {sugar_link id=$moduleTabId module=$modulekey data=$module extraparams=$extraparams}
-                        </li>
-                    {/foreach}
-                    {foreach from=$modules.extra item=submodulename key=submodule}
-                        <li style="float:right;">
-                            <a href="{sugar_link module=$modulekey action='EditView' link_only=1}"><span class="glyphicon glyphicon-plus"></span></a>
-                        </li>
-                        <li>
-                            <a href="{sugar_link module=$submodule link_only=1 extraparams=$extraparams}">{$submodulename}</a>
-                        </li>
-                    {/foreach}
+                {capture name=extraparams assign=extraparams}parentTab={$group}{/capture}
+                                {foreach from=$modules.modules item=module key=modulekey}
+                                    {if $modulekey !='Home' && $modulekey !='Calendar'}
+                                        <li style="float:right;">
+                                            <a href="{sugar_link module=$modulekey action='EditView' link_only=1}"><span class="glyphicon glyphicon-plus"></span></a>
+                                        </li>
+                                    {/if}
+                                    <li>
+                                        {capture name=moduleTabId assign=moduleTabId}moduleTab_{$smarty.foreach.moduleList.index}_{$module}{/capture}
+                                        {sugar_link id=$moduleTabId module=$modulekey data=$module extraparams=$extraparams}
+                                    </li>
+                                {/foreach}
+                                {foreach from=$modules.extra item=submodulename key=submodule}
+                                    <li style="float:right;">
+                                        <a href="{sugar_link module=$modulekey action='EditView' link_only=1}"><span class="glyphicon glyphicon-plus"></span></a>
+                                    </li>
+                                    <li>
+                                        <a href="{sugar_link module=$submodule link_only=1 extraparams=$extraparams}">{$submodulename}</a>
+                                    </li>
+                                {/foreach}
                 {/if}
             {/foreach}
         </div>