Skip to content

Commit

Permalink
Merge branch 'hotfix-7.8.x' into 7.8.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@gymad
gymad committed Apr 30, 2019
2 parents ec1ebda + 5a72c94 commit bab751c
Show file tree
Hide file tree
Showing 26 changed files with 278 additions and 210 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## SuiteCRM 7.8.28 LTS
## SuiteCRM 7.8.29 LTS

[![Build Status](https://travis-ci.org/salesagility/SuiteCRM.svg?branch=hotfix-7.8.x)](https://travis-ci.org/salesagility/SuiteCRM)

Expand Down
37 changes: 19 additions & 18 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions data/Relationships/M2MRelationship.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ public function remove($lhs, $rhs)
$this->def['join_key_rhs'] => $rhs->id
);

if(!empty($this->def['relationship_role_column']) && !empty($this->def['relationship_role_column_value'])) {
$dataToRemove[$this->def['relationship_role_column']] = $this->def['relationship_role_column_value'];
}
$dataToRemove['deleted'] = 0;

if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
{
Expand Down
4 changes: 4 additions & 0 deletions include/InlineEditing/InlineEditing.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,10 @@ function saveField($field, $id, $module, $value)
} else {
$bean->$field = $value;
}
} else if ($module === 'Leads' && $field === 'account_name') {
require_once('modules/Leads/LeadFormBase.php');
$bean->$field = $value;
$bean->account_id = LeadFormBase::handleLeadAccountName($bean);
} else {
$bean->$field = $value;
}
Expand Down
3 changes: 2 additions & 1 deletion include/Popups/tpls/header.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
*}
<script type="text/javascript" src="{sugar_getjspath file='include/javascript/sugar_3.js'}"></script>
<script type="text/javascript" src="{sugar_getjspath file='include/javascript/popup_helper.js'}"></script>
{$STYLE_JS}
<script type="text/javascript">
{$ASSOCIATED_JAVASCRIPT_DATA}
Expand Down Expand Up @@ -125,4 +126,4 @@ function clearAll() {
{$multiSelectData}
<input class="button" type="button" id="MassUpdate_select_button" value='{$APP.LBL_SELECT_BUTTON_LABEL}' onclick="send_back_selected('{$module}',document.MassUpdate,'mass[]','{$APP.ERR_NOTHING_SELECTED}');">
{{/if}}
{{/if}}
46 changes: 24 additions & 22 deletions include/SugarObjects/templates/basic/metadata/detailviewdefs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,30 @@
),
),

'panels' => array(

'panels' =>
array(
'name',
'assigned_user_name',
),
'default' =>
array(
array(
'name',
'assigned_user_name',
),
array(
array(
'name' => 'date_entered',
'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
'label' => 'LBL_DATE_ENTERED',
),
array(
'name' => 'date_modified',
'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
'label' => 'LBL_DATE_MODIFIED',
),
),

array(
array(
'name' => 'date_entered',
'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
'label' => 'LBL_DATE_ENTERED',
),
array(
'name' => 'date_modified',
'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
'label' => 'LBL_DATE_MODIFIED',
),
),

array(
'description',
),
)
array(
'description',
),
)
)
);
64 changes: 33 additions & 31 deletions include/SugarObjects/templates/company/metadata/detailviewdefs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,44 +50,46 @@
),
),
'panels' => array(
array('name', 'phone_office'),
array(array('name' => 'website', 'type' => 'link'), 'phone_fax'),
array('ticker_symbol', array('name' => 'phone_alternate', 'label' => 'LBL_OTHER_PHONE')),
array('', 'employees'),
array('ownership', 'rating'),
array('industry'),
array($_object_name . '_type', 'annual_revenue'),
array(
'default' => array(
array('name', 'phone_office'),
array(array('name' => 'website', 'type' => 'link'), 'phone_fax'),
array('ticker_symbol', array('name' => 'phone_alternate', 'label' => 'LBL_OTHER_PHONE')),
array('', 'employees'),
array('ownership', 'rating'),
array('industry'),
array($_object_name . '_type', 'annual_revenue'),
array(
'name' => 'date_modified',
'label' => 'LBL_DATE_MODIFIED',
'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}'
array(
'name' => 'date_modified',
'label' => 'LBL_DATE_MODIFIED',
'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}'
),
),
),
array(
array('name' => 'assigned_user_name', 'label' => 'LBL_ASSIGNED_TO_NAME'),
array(
'name' => 'date_entered',
'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}'
)
),
array(
array(
'name' => 'billing_address_street',
'label' => 'LBL_BILLING_ADDRESS',
'type' => 'address',
'displayParams' => array('key' => 'billing'),
array('name' => 'assigned_user_name', 'label' => 'LBL_ASSIGNED_TO_NAME'),
array(
'name' => 'date_entered',
'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}'
)
),
array(
'name' => 'shipping_address_street',
'label' => 'LBL_SHIPPING_ADDRESS',
'type' => 'address',
'displayParams' => array('key' => 'shipping'),
array(
'name' => 'billing_address_street',
'label' => 'LBL_BILLING_ADDRESS',
'type' => 'address',
'displayParams' => array('key' => 'billing'),
),
array(
'name' => 'shipping_address_street',
'label' => 'LBL_SHIPPING_ADDRESS',
'type' => 'address',
'displayParams' => array('key' => 'shipping'),
),
),
),

array('description'),
array('email1'),
array('description'),
array('email1'),
),
),

);
55 changes: 28 additions & 27 deletions include/SugarObjects/templates/file/metadata/detailviewdefs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,45 +54,46 @@
),
),
'panels' => array(

array(
'default' => array(

array(
'name' => 'document_name',
'label' => 'LBL_DOC_NAME',

array(
'name' => 'document_name',
'label' => 'LBL_DOC_NAME',
),
array(
'name' => 'uploadfile',
'displayParams' => array('link' => 'uploadfile', 'id' => 'id'),
),

),
array(
'name' => 'uploadfile',
'displayParams' => array('link' => 'uploadfile', 'id' => 'id'),
'category_id',
'subcategory_id',
),

),
array(
'category_id',
'subcategory_id',
),

array(

'status',
array(

),
array(
'active_date',
'exp_date',
),
'status',

array(
array('name' => 'assigned_user_name', 'label' => 'LBL_ASSIGNED_TO'),
),
),
array(
'active_date',
'exp_date',
),

array(
array(
array('name' => 'assigned_user_name', 'label' => 'LBL_ASSIGNED_TO'),
),

array(
'name' => 'description',
'label' => 'LBL_DOC_DESCRIPTION',

array(
'name' => 'description',
'label' => 'LBL_DOC_DESCRIPTION',
),
),
),

)
);
Loading

0 comments on commit bab751c

Please sign in to comment.