Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • vtiger/vtigercrm
  • varma/vtigercrm
  • alanbell/vtigercrm
  • mariusz.krzaczkowski/vtigercrm
  • manu.k/vtigercrm
  • adrgranado/vtigercrm
  • uma.s/vtigercrm
  • sardoj/vtigercrm
  • preexo/vtigercrm
  • david.valminos/vtigercrm
  • luca.saba/vtigercrm
  • dubwise/vtigercrm
  • valmir.ttcasolucoes/vtigercrm
  • lord_alan/vtigercrm
  • adrien.futschik/vtigercrm
  • edonit.rexhepi/vtigercrm
  • robert.heinze/vtigercrm
  • nrdimatteo/vtigercrm
  • sebastianzahan/vtigercrm
  • Miky/vtigercrm
  • germanf/vtigercrm
  • bernhardkau1/vtigercrm
  • olegtsoy/vtigercrm
  • grandel/vtigercrm
  • mario.thummler/vtigercrm
  • sutharsan/vtigercrm
  • james.douglas/vtigercrm
  • vikas/vtigercrm
  • jeffmchristensen/vtigercrm
  • lukasz.g/vtigercrm
  • nicolas.gasnier/vtigercrm
  • hamish.theitcompany/vtigercrm
  • engrbm87/vtigercrm
  • Quoc/vtigercrm
  • peter.maria.engeli/vtigercrm
  • kiranraju.j/vtigercrm
  • manuel.lozano/vtigercrm
  • dhaupin/vtigercrm
  • Ragupathyranesh/vtigercrm
  • Stefanbauer/vtigercrm
  • ruben.estrada/vtigercrm
  • sg_mwi1/vtigercrm
  • khaluk/vtigercrm
  • franzfroemel/vtigercrm
  • milan9615/vtigercrm
  • carlos.martin/vtigercrm
  • cmaggi/vtigercrm
  • Soltoon.theLeader/vtigercrm
  • alex.kaplun/vtigercrm
  • navid.hosseini/vtigercrm
  • maie/vtigercrm
  • simonetravaglini/vtigercrm
  • bertrand.wattel/vtigercrm
  • balaji.m/vtigercrm
  • mclarke4/vtigercrm
  • lajeeshk/vtigercrm
  • liam/vtigercrm
  • novikov.sergey/vtigercrm
  • johnwayne.williamson/vtigercrm
  • florian.strahberger-schramm/vtigercrm
  • daniel.schaefer/vtigercrm
  • christopher.gunther/vtigercrm
  • adrien.faveraux/vtigercrm
  • carsten.brandt/vtigercrm
  • stephane.molano/vtigercrm
  • krastan.petrov/vtigercrm
  • alfredo.bravo/vtigercrm
  • flipflop.Joe/vtigercrm
  • mirko.stagni/vtigercrm
  • remigio.ruberto/vtigercrm
  • gautam.dhudashiya/vtigercrm
  • manish.devitechnosolutions1/vtigercrm
  • matinbeigi/vtigercrm
  • devs/vtigercrm
  • happy.dev/vtigercrm
  • m.gigon/vtigercrm
  • manuelmigone/vtigercrm
  • eduardo.gqf/vtigercrm
  • elsayedEl-araby/vtigercrm
  • mirza.mehran/vtigercrm
  • maurice.courtois/vtigercrm
  • zuhri.utama/vtigercrm
  • shilpa.k/vtigercrm
  • Ignazio/vtigercrm
  • code80team/vtigercrm
  • code80/vtigercrm
  • nilay.automatesmb/cache
  • greeshma.kk/vtigercrm
  • vijay.tilak/vtigercrm
  • Paolo.Palamini/vtigercrm
  • estevan/vtigercrm
  • mobilcmcdk/vtigercrm
  • massimiliano.vessi/vtigercrm
  • daniel.voelskow/vtigercrm
  • james1/vtigercrm
  • lokesh.s/vtigercrm
  • rdb/vtigercrm
  • neftaliyagua/vtigercrm
  • angelo.paglialonga/vtigercrm
  • webmarka/vtigercrm
  • javanile/vtigercrm
  • akshath/vtigercrm
  • Hemanth/vtigercrm
  • opencrmitalia/vtigercrm
  • direzione/vtigercrm
  • umadas306/vtigercrm
  • jd-wraptec/vtigercrm
  • felipe.camacho/vtigercrm
  • Martin.allen/vtigercrm
  • amit.r/vtigercrm
  • vicus/vtigercrm
  • dev.osmi/vtigercrm
  • laurent.guillout/vtigercrm
  • christian.blaeul/vtigercrm
  • ap.js100/vtigercrm
  • yoann.mourot/vtigercrm-temp
  • christian.cruz/vtigercrm
  • zyli/vtigercrm
  • kaushik.p/vtigercrm
  • Madhuk/vtigercrm
  • cinakzm/vtigercrm
  • raquel.martinez/vtigercrm
  • tosajibadhi/vtigercrm
  • melvin.i/vtigercrm-melvin
  • ashashingadia/vtigercrm
  • stefanwarnat/vtigercrm
  • saran.s/vtigercrm
  • eduardomozart/vtigercrm
  • Daniel.Lennartz1/vtigercrm
  • juergen.fassmann/vtigercrm
  • Michel.Ram/vtigercrm
  • vincenzo.bruno/vtigercrm
  • Hitesh.Solanki/vtigercrm
133 results
Show changes
Commits on Source (4)
...@@ -112,7 +112,7 @@ class VTEntityData{ ...@@ -112,7 +112,7 @@ class VTEntityData{
* @return The entity id. * @return The entity id.
*/ */
function getId(){ function getId(){
return property_exists($this->focus, "id") ? $this->focus->id : null; return is_object($this->focus) && property_exists($this->focus, "id") ? $this->focus->id : null;
} }
/** /**
......
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
</optgroup> </optgroup>
{/foreach} {/foreach}
{*Required to include event fields for columns in calendar module advanced filter*} {*Required to include event fields for columns in calendar module advanced filter*}
{if isset($EVENT_RECORD_STRUCTURE) && is_array($EVENT_RECORD_STRUCTURE)}
{foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$EVENT_RECORD_STRUCTURE} {foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$EVENT_RECORD_STRUCTURE}
<optgroup label='{vtranslate($BLOCK_LABEL, 'Events')}'> <optgroup label='{vtranslate($BLOCK_LABEL, 'Events')}'>
{foreach key=FIELD_NAME item=FIELD_MODEL from=$BLOCK_FIELDS} {foreach key=FIELD_NAME item=FIELD_MODEL from=$BLOCK_FIELDS}
...@@ -104,6 +105,7 @@ ...@@ -104,6 +105,7 @@
{/foreach} {/foreach}
</optgroup> </optgroup>
{/foreach} {/foreach}
{/if}
</select> </select>
<input type="hidden" name="columnslist" value='{Vtiger_Functions::jsonEncode($SELECTED_FIELDS)}' /> <input type="hidden" name="columnslist" value='{Vtiger_Functions::jsonEncode($SELECTED_FIELDS)}' />
<input id="mandatoryFieldsList" type="hidden" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($MANDATORY_FIELDS))}' /> <input id="mandatoryFieldsList" type="hidden" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($MANDATORY_FIELDS))}' />
......
...@@ -26,13 +26,15 @@ ...@@ -26,13 +26,15 @@
{assign var=columnNameApi value=getCustomViewColumnName} {assign var=columnNameApi value=getCustomViewColumnName}
{/if} {/if}
<option value="{$FIELD_MODEL->$columnNameApi()}" data-fieldtype="{$FIELD_MODEL->getFieldType()}" data-field-name="{$FIELD_NAME}" <option value="{$FIELD_MODEL->$columnNameApi()}" data-fieldtype="{$FIELD_MODEL->getFieldType()}" data-field-name="{$FIELD_NAME}"
{if decode_html($FIELD_MODEL->$columnNameApi()) eq decode_html($CONDITION_INFO['columnname'])} {if isset($CONDITION_INFO['columnname']) && decode_html($FIELD_MODEL->$columnNameApi()) eq decode_html($CONDITION_INFO['columnname'])}
{assign var=FIELD_TYPE value=$FIELD_MODEL->getFieldType()} {assign var=FIELD_TYPE value=$FIELD_MODEL->getFieldType()}
{assign var=SELECTED_FIELD_MODEL value=$FIELD_MODEL} {assign var=SELECTED_FIELD_MODEL value=$FIELD_MODEL}
{if $FIELD_MODEL->getFieldDataType() == 'reference' || $FIELD_MODEL->getFieldDataType() == 'multireference'} {if $FIELD_MODEL->getFieldDataType() == 'reference' || $FIELD_MODEL->getFieldDataType() == 'multireference'}
{$FIELD_TYPE='V'} {$FIELD_TYPE='V'}
{/if} {/if}
{if isset($CONDITION_INFO['value'])}
{$FIELD_INFO['value'] = decode_html($CONDITION_INFO['value'])} {$FIELD_INFO['value'] = decode_html($CONDITION_INFO['value'])}
{/if}
selected="selected" selected="selected"
{/if} {/if}
{if ($MODULE_MODEL->get('name') eq 'Calendar' || $MODULE_MODEL->get('name') eq 'Events') && ($FIELD_NAME eq 'recurringtype')} {if ($MODULE_MODEL->get('name') eq 'Calendar' || $MODULE_MODEL->get('name') eq 'Events') && ($FIELD_NAME eq 'recurringtype')}
...@@ -67,6 +69,7 @@ ...@@ -67,6 +69,7 @@
</optgroup> </optgroup>
{/foreach} {/foreach}
{* Required to display event fields also while adding conditions *} {* Required to display event fields also while adding conditions *}
{if isset($EVENT_RECORD_STRUCTURE) && is_array($EVENT_RECORD_STRUCTURE)}
{foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$EVENT_RECORD_STRUCTURE} {foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$EVENT_RECORD_STRUCTURE}
<optgroup label='{vtranslate($BLOCK_LABEL, 'Events')}'> <optgroup label='{vtranslate($BLOCK_LABEL, 'Events')}'>
{foreach key=FIELD_NAME item=FIELD_MODEL from=$BLOCK_FIELDS} {foreach key=FIELD_NAME item=FIELD_MODEL from=$BLOCK_FIELDS}
...@@ -114,27 +117,30 @@ ...@@ -114,27 +117,30 @@
{/foreach} {/foreach}
</optgroup> </optgroup>
{/foreach} {/foreach}
{/if}
</select> </select>
</div> </div>
<div class="conditionComparator col-lg-3 col-md-3 col-sm-3"> <div class="conditionComparator col-lg-3 col-md-3 col-sm-3">
<select class="{if empty($NOCHOSEN)}select2{/if} col-lg-12" name="comparator"> <select class="{if empty($NOCHOSEN)}select2{/if} col-lg-12" name="comparator">
<option value="none">{vtranslate('LBL_NONE',$MODULE)}</option> <option value="none">{vtranslate('LBL_NONE',$MODULE)}</option>
{assign var=ADVANCE_FILTER_OPTIONS value=$ADVANCED_FILTER_OPTIONS_BY_TYPE[$FIELD_TYPE]} {if isset($FIELD_TYPE) && isset($ADVANCED_FILTER_OPTIONS_BY_TYPE[$FIELD_TYPE])}
{if $FIELD_TYPE eq 'D' || $FIELD_TYPE eq 'DT'} {assign var=ADVANCE_FILTER_OPTIONS value=$ADVANCED_FILTER_OPTIONS_BY_TYPE[$FIELD_TYPE]}
{assign var=DATE_FILTER_CONDITIONS value=array_keys($DATE_FILTERS)} {if $FIELD_TYPE eq 'D' || $FIELD_TYPE eq 'DT'}
{assign var=ADVANCE_FILTER_OPTIONS value=array_merge($ADVANCE_FILTER_OPTIONS,$DATE_FILTER_CONDITIONS)} {assign var=DATE_FILTER_CONDITIONS value=array_keys($DATE_FILTERS)}
{/if} {assign var=ADVANCE_FILTER_OPTIONS value=array_merge($ADVANCE_FILTER_OPTIONS,$DATE_FILTER_CONDITIONS)}
{foreach item=ADVANCE_FILTER_OPTION from=$ADVANCE_FILTER_OPTIONS}
<option value="{$ADVANCE_FILTER_OPTION}"
{if $ADVANCE_FILTER_OPTION eq $CONDITION_INFO['comparator']}
selected
{/if} {/if}
>{vtranslate($ADVANCED_FILTER_OPTIONS[$ADVANCE_FILTER_OPTION])}</option> {foreach item=ADVANCE_FILTER_OPTION from=$ADVANCE_FILTER_OPTIONS}
{/foreach} <option value="{$ADVANCE_FILTER_OPTION}"
{if $ADVANCE_FILTER_OPTION eq $CONDITION_INFO['comparator']}
selected
{/if}
>{vtranslate($ADVANCED_FILTER_OPTIONS[$ADVANCE_FILTER_OPTION])}</option>
{/foreach}
{/if}
</select> </select>
</div> </div>
<div class="col-lg-4 col-md-4 col-sm-4 fieldUiHolder"> <div class="col-lg-4 col-md-4 col-sm-4 fieldUiHolder">
<input name="{if $SELECTED_FIELD_MODEL}{$SELECTED_FIELD_MODEL->get('name')}{/if}" data-value="value" class=" inputElement col-lg-12" type="text" value="{$CONDITION_INFO['value']|escape}" /> <input name="{if isset($SELECTED_FIELD_MODEL)}{$SELECTED_FIELD_MODEL->get('name')}{/if}" data-value="value" class=" inputElement col-lg-12" type="text" value="{if isset($CONDITION_INFO['value'])}{$CONDITION_INFO['value']|escape}{/if}" />
</div> </div>
<span class="hide"> <span class="hide">
<!-- TODO : see if you need to respect CONDITION_INFO condition or / and --> <!-- TODO : see if you need to respect CONDITION_INFO condition or / and -->
......
...@@ -31,8 +31,9 @@ ...@@ -31,8 +31,9 @@
<link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/jquery/daterangepicker/daterangepicker.css")}'> <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/jquery/daterangepicker/daterangepicker.css")}'>
<input type="hidden" id="inventoryModules" value={ZEND_JSON::encode($INVENTORY_MODULES)}> <input type="hidden" id="inventoryModules" value={ZEND_JSON::encode($INVENTORY_MODULES)}>
{if isset($SELECTED_MENU_CATEGORY)}
{assign var=V7_THEME_PATH value=Vtiger_Theme::getv7AppStylePath($SELECTED_MENU_CATEGORY)} {assign var=V7_THEME_PATH value=Vtiger_Theme::getv7AppStylePath($SELECTED_MENU_CATEGORY)}
{/if}
{if strpos($V7_THEME_PATH,".less")!== false} {if strpos($V7_THEME_PATH,".less")!== false}
<link type="text/css" rel="stylesheet/less" href="{vresource_url($V7_THEME_PATH)}" media="screen" /> <link type="text/css" rel="stylesheet/less" href="{vresource_url($V7_THEME_PATH)}" media="screen" />
{else} {else}
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
<script src="{vresource_url('layouts/v7/lib/jquery/jquery.min.js')}"></script> <script src="{vresource_url('layouts/v7/lib/jquery/jquery.min.js')}"></script>
<script src="{vresource_url('layouts/v7/lib/jquery/jquery-migrate-1.4.1.js')}"></script> <script src="{vresource_url('layouts/v7/lib/jquery/jquery-migrate-1.4.1.js')}"></script>
<script type="text/javascript"> <script type="text/javascript">
var _META = { 'module': "{$MODULE}", view: "{$VIEW}", 'parent': "{$PARENT_MODULE}", 'notifier':"{$NOTIFIER_URL}", 'app':"{$SELECTED_MENU_CATEGORY}" }; var _META = { 'module': "{$MODULE}", view: "{$VIEW}", 'parent': "{$PARENT_MODULE}", 'notifier':"{$NOTIFIER_URL}", 'app':"{if isset($SELECTED_MENU_CATEGORY)} {$SELECTED_MENU_CATEGORY}{/if}" };
{if $EXTENSION_MODULE} {if $EXTENSION_MODULE}
var _EXTENSIONMETA = { 'module': "{$EXTENSION_MODULE}", view: "{$EXTENSION_VIEW}"}; var _EXTENSIONMETA = { 'module': "{$EXTENSION_MODULE}", view: "{$EXTENSION_VIEW}"};
{/if} {/if}
......
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
{if !isset($FIELD_NAME)} {if !isset($FIELD_NAME)}
{assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()} {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
{/if} {/if}
{assign var="fieldValue" value=purifyHtmlEventAttributes($FIELD_MODEL->get('fieldvalue'),true)}
{if $fieldValue === null}
{assign var="fieldValue" value=""}
{/if}
{if $FIELD_MODEL->get('uitype') eq '19' || $FIELD_MODEL->get('uitype') eq '20'} {if $FIELD_MODEL->get('uitype') eq '19' || $FIELD_MODEL->get('uitype') eq '20'}
<textarea rows="3" id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" class="inputElement textAreaElement col-lg-12 {if $FIELD_MODEL->isNameField()}nameField{/if}" name="{$FIELD_NAME}" {if $FIELD_NAME eq "notecontent"}id="{$FIELD_NAME}"{/if} {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} <textarea rows="3" id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" class="inputElement textAreaElement col-lg-12 {if $FIELD_MODEL->isNameField()}nameField{/if}" name="{$FIELD_NAME}" {if $FIELD_NAME eq "notecontent"}id="{$FIELD_NAME}"{/if} {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
{if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if} {if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
...@@ -22,7 +26,7 @@ ...@@ -22,7 +26,7 @@
data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}' data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
{/if} {/if}
> >
{purifyHtmlEventAttributes($FIELD_MODEL->get('fieldvalue'),true)|regex_replace:"/(?!\w)\&nbsp;(?=\w)/":" "} {$fieldValue|regex_replace:"/(?!\w)\&nbsp;(?=\w)/":" "}
</textarea> </textarea>
{else} {else}
<textarea rows="5" id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" class="inputElement {if $FIELD_MODEL->isNameField()}nameField{/if}" name="{$FIELD_NAME}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} <textarea rows="5" id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" class="inputElement {if $FIELD_MODEL->isNameField()}nameField{/if}" name="{$FIELD_NAME}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
...@@ -31,7 +35,7 @@ ...@@ -31,7 +35,7 @@
data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}' data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
{/if} {/if}
> >
{purifyHtmlEventAttributes($FIELD_MODEL->get('fieldvalue'),true)|regex_replace:"/(?!\w)\&nbsp;(?=\w)/":" "} {$fieldValue|regex_replace:"/(?!\w)\&nbsp;(?=\w)/":" "}
</textarea> </textarea>
{/if} {/if}
{/strip} {/strip}
...@@ -1022,6 +1022,9 @@ class CustomView extends CRMEntity { ...@@ -1022,6 +1022,9 @@ class CustomView extends CRMEntity {
} }
$advfilterval = implode(",", $val); $advfilterval = implode(",", $val);
} }
if(!is_array($criteria)) {
$criteria = [];
}
$criteria['value'] = $advfilterval; $criteria['value'] = $advfilterval;
$criteria['column_condition'] = $relcriteriarow["column_condition"]; $criteria['column_condition'] = $relcriteriarow["column_condition"];
......
...@@ -356,7 +356,7 @@ class CustomView_Record_Model extends Vtiger_Base_Model { ...@@ -356,7 +356,7 @@ class CustomView_Record_Model extends Vtiger_Base_Model {
if(empty($groupInfo)) continue; if(empty($groupInfo)) continue;
$groupColumns = $groupInfo['columns']; $groupColumns = $groupInfo['columns'];
$groupCondition = $groupInfo['condition']; $groupCondition = isset($groupInfo['condition']);
foreach($groupColumns as $columnIndex => $columnCondition) { foreach($groupColumns as $columnIndex => $columnCondition) {
if(empty($columnCondition)) continue; if(empty($columnCondition)) continue;
...@@ -446,7 +446,7 @@ class CustomView_Record_Model extends Vtiger_Base_Model { ...@@ -446,7 +446,7 @@ class CustomView_Record_Model extends Vtiger_Base_Model {
$advFilterList[$groupIndex]["conditionexpression"] = $groupConditionExpression; $advFilterList[$groupIndex]["conditionexpression"] = $groupConditionExpression;
} }
$groupConditionExpression = $advFilterList[$groupIndex]["conditionexpression"]; $groupConditionExpression = isset($advFilterList[$groupIndex]["conditionexpression"]);
if(empty($groupConditionExpression)) continue; // Case when the group doesn't have any column criteria if(empty($groupConditionExpression)) continue; // Case when the group doesn't have any column criteria
$advGroupSql = 'INSERT INTO vtiger_cvadvfilter_grouping(groupid,cvid,group_condition,condition_expression) VALUES (?,?,?,?)'; $advGroupSql = 'INSERT INTO vtiger_cvadvfilter_grouping(groupid,cvid,group_condition,condition_expression) VALUES (?,?,?,?)';
......
...@@ -57,7 +57,7 @@ class Vtiger_List_View extends Vtiger_Index_View { ...@@ -57,7 +57,7 @@ class Vtiger_List_View extends Vtiger_Index_View {
$this->listViewModel = Vtiger_ListView_Model::getInstance($moduleName, $cvId, $listHeaders); $this->listViewModel = Vtiger_ListView_Model::getInstance($moduleName, $cvId, $listHeaders);
$orderParams = $this->listViewModel->getSortParamsSession($listViewSessionKey); $orderParams = $this->listViewModel->getSortParamsSession($listViewSessionKey);
if(empty($listHeaders) && is_array($orderParams)) { if(empty($listHeaders) && is_array($orderParams) && array_key_exists('list_headers', $orderParams)) {
$listHeaders = $orderParams['list_headers']; $listHeaders = $orderParams['list_headers'];
} }
...@@ -221,7 +221,7 @@ class Vtiger_List_View extends Vtiger_Index_View { ...@@ -221,7 +221,7 @@ class Vtiger_List_View extends Vtiger_Index_View {
$orderBy = ''; $orderBy = '';
$sortOrder = ''; $sortOrder = '';
} }
if(empty($listHeaders) && is_array($orderParams)) { if(empty($listHeaders) && is_array($orderParams) && array_key_exists('list_headers', $orderParams)) {
$listHeaders = $orderParams['list_headers']; $listHeaders = $orderParams['list_headers'];
} }
...@@ -232,21 +232,20 @@ class Vtiger_List_View extends Vtiger_Index_View { ...@@ -232,21 +232,20 @@ class Vtiger_List_View extends Vtiger_Index_View {
if(empty($orderBy) && empty($searchValue) && empty($pageNumber)) { if(empty($orderBy) && empty($searchValue) && empty($pageNumber)) {
if($orderParams) { if($orderParams) {
$pageNumber = $orderParams['page']; $pageNumber = isset($orderParams['page']) ? $orderParams['page'] : "";
$orderBy = $orderParams['orderby']; $orderBy = isset($orderParams['orderby']) ? $orderParams['orderby'] : "";
$sortOrder = $orderParams['sortorder']; $sortOrder = isset($orderParams['sortorder']) ? $orderParams['sortorder'] : "";
$searchKey = $orderParams['search_key']; $searchKey = isset($orderParams['search_key']) ? $orderParams['search_key'] : "";
$searchValue = $orderParams['search_value']; $searchValue = isset($orderParams['search_value']) ? $orderParams['search_value'] : "";
$operator = $orderParams['operator']; $operator = isset($orderParams['operator']) ? $orderParams['operator'] : "";
if(empty($tagParams)){ if(empty($tagParams)){
$tagParams = $orderParams['tag_params']; $tagParams = isset($orderParams['tag_params']) ? $orderParams['tag_params'] : "";
} }
if(empty($searchParams)) { if(empty($searchParams)) {
$searchParams = $orderParams['search_params']; $searchParams = isset($orderParams['search_params']) ? $orderParams['search_params'] : "";
} }
if(empty($starFilterMode)) { if(empty($starFilterMode)) {
$starFilterMode = $orderParams['star_filter_mode']; $starFilterMode = isset($orderParams['star_filter_mode']) ? $orderParams['star_filter_mode'] : "";
} }
} }
} else if($request->get('nolistcache') != 1) { } else if($request->get('nolistcache') != 1) {
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
require_once('modules/com_vtiger_workflow/VTEntityCache.inc'); require_once('modules/com_vtiger_workflow/VTEntityCache.inc');
require_once('modules/com_vtiger_workflow/VTWorkflowUtils.php'); require_once('modules/com_vtiger_workflow/VTWorkflowUtils.php');
#[\AllowDynamicProperties]
class VTUpdateFieldsTask extends VTTask { class VTUpdateFieldsTask extends VTTask {
public $executeImmediately = true; public $executeImmediately = true;
......
...@@ -637,6 +637,7 @@ class Project extends CRMEntity { ...@@ -637,6 +637,7 @@ class Project extends CRMEntity {
} }
function get_emails($recordId, $currentTabId, $relTabId, $actions=false) { function get_emails($recordId, $currentTabId, $relTabId, $actions=false) {
$button = '';
global $currentModule,$single_pane_view; global $currentModule,$single_pane_view;
$relModuleName = vtlib_getModuleNameById($relTabId); $relModuleName = vtlib_getModuleNameById($relTabId);
$singularRelModuleName = vtlib_tosingular($relModuleName); $singularRelModuleName = vtlib_tosingular($relModuleName);
...@@ -693,6 +694,7 @@ class Project extends CRMEntity { ...@@ -693,6 +694,7 @@ class Project extends CRMEntity {
* @return <Array> - $projectTasks * @return <Array> - $projectTasks
*/ */
public function getProjectTasks($recordId) { public function getProjectTasks($recordId) {
$projectTasks = array();
$db = PearDatabase::getInstance(); $db = PearDatabase::getInstance();
$sql = "SELECT projecttaskid FROM vtiger_projecttask $sql = "SELECT projecttaskid FROM vtiger_projecttask
INNER JOIN vtiger_crmentity ON vtiger_projecttask.projecttaskid = vtiger_crmentity.crmid INNER JOIN vtiger_crmentity ON vtiger_projecttask.projecttaskid = vtiger_crmentity.crmid
......
...@@ -77,7 +77,7 @@ class ProjectTask_Module_Model extends Vtiger_Module_Model { ...@@ -77,7 +77,7 @@ class ProjectTask_Module_Model extends Vtiger_Module_Model {
} }
} }
//ProjectTask Progress and Status should show in Projects summary view //ProjectTask Progress and Status should show in Projects summary view
if(!$relatedListFields['projecttaskstatus']) { if (!isset($relatedListFields['projecttaskstatus']) || !$relatedListFields['projecttaskstatus']) {
$fieldModel = Vtiger_Field_Model::getInstance('projecttaskstatus', $this); $fieldModel = Vtiger_Field_Model::getInstance('projecttaskstatus', $this);
if($fieldModel && $fieldModel->isViewableInDetailView()) { if($fieldModel && $fieldModel->isViewableInDetailView()) {
$relatedListFields['projecttaskstatus'] = 'projecttaskstatus'; $relatedListFields['projecttaskstatus'] = 'projecttaskstatus';
......