diff --git a/layouts/v7/modules/Reports/ChartEditStep2.tpl b/layouts/v7/modules/Reports/ChartEditStep2.tpl
index a7e651de80ae77e85d2bcee0e70dad1c9549834d..4eb05155ca7241cef23c3c0987eef1d1971faaa0 100644
--- a/layouts/v7/modules/Reports/ChartEditStep2.tpl
+++ b/layouts/v7/modules/Reports/ChartEditStep2.tpl
@@ -15,7 +15,7 @@
{if $REPORT_MODEL->get('members')}
<input type="hidden" name="members" value={ZEND_JSON::encode($REPORT_MODEL->get('members'))} />
{/if}
- <input type="hidden" name="folderid" value="{$REPORT_MODEL->get('folderid')}" >
+ <input type="hidden" name="reportfolderid" value="{$REPORT_MODEL->get('reportfolderid')}" >
<input type="hidden" name="reports_description" value="{$REPORT_MODEL->get('description')}" >
<input type="hidden" name="primary_module" value="{$PRIMARY_MODULE}" >
<input type="hidden" name="secondary_modules" value={ZEND_JSON::encode($SECONDARY_MODULES)} >
diff --git a/layouts/v7/modules/Reports/ChartEditStep3.tpl b/layouts/v7/modules/Reports/ChartEditStep3.tpl
index 38ff1fbaf6ba03424d1704a9b505534515749fbd..552bd09a7ea59a1a02af475df1ec9a08599e315a 100644
--- a/layouts/v7/modules/Reports/ChartEditStep3.tpl
+++ b/layouts/v7/modules/Reports/ChartEditStep3.tpl
@@ -15,7 +15,7 @@
{if $REPORT_MODEL->get('members')}
<input type="hidden" name="members" value={ZEND_JSON::encode($REPORT_MODEL->get('members'))} />
{/if}
- <input type="hidden" name="folderid" value="{$REPORT_MODEL->get('folderid')}" >
+ <input type="hidden" name="reportfolderid" value="{$REPORT_MODEL->get('reportfolderid')}" >
<input type="hidden" name="reports_description" value="{Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('reports_description'))}" >
<input type="hidden" name="primary_module" value="{$PRIMARY_MODULE}" >
<input type="hidden" name="secondary_modules" value={ZEND_JSON::encode($SECONDARY_MODULES)} >
diff --git a/layouts/v7/modules/Reports/ChartReportHeader.tpl b/layouts/v7/modules/Reports/ChartReportHeader.tpl
index d5c401247288e116b646e3d78acbe778d7c4075f..22190b29375b2b11ddf4f71cdf54b76760df9c40 100644
--- a/layouts/v7/modules/Reports/ChartReportHeader.tpl
+++ b/layouts/v7/modules/Reports/ChartReportHeader.tpl
@@ -17,7 +17,7 @@
<input type="hidden" name="action" value="ChartSave" />
<input type="hidden" name="recordId" id="recordId" value="{$RECORD}" />
<input type="hidden" name="reportname" value="{$REPORT_MODEL->get('reportname')}" />
- <input type="hidden" name="folderid" value="{$REPORT_MODEL->get('folderid')}" />
+ <input type="hidden" name="reportfolderid" value="{$REPORT_MODEL->get('reportfolderid')}" />
<input type="hidden" name="reports_description" value="{$REPORT_MODEL->get('reports_description')}" />
<input type="hidden" name="primary_module" value="{$PRIMARY_MODULE}" />
<input type="hidden" name="secondary_modules" value={ZEND_JSON::encode($SECONDARY_MODULES)} />
diff --git a/layouts/v7/modules/Reports/Step1.tpl b/layouts/v7/modules/Reports/Step1.tpl
index 86861850b00afd1215d76fb69a5e1b189b58374f..d581273400c78b22bac25fef6a574bbcb11c8e87 100644
--- a/layouts/v7/modules/Reports/Step1.tpl
+++ b/layouts/v7/modules/Reports/Step1.tpl
@@ -34,7 +34,7 @@
<div class="form-group">
<label class="col-lg-3 control-label textAlignLeft">{vtranslate('LBL_REPORT_FOLDER',$MODULE)}<span class="redColor">*</span></label>
<div class="col-lg-4">
- <select class="select2 col-lg-12 inputElement" name="folderid" data-rule-required="true">
+ <select class="select2 col-lg-12 inputElement" name="reportfolderid" data-rule-required="true">
{foreach item=REPORT_FOLDER from=$REPORT_FOLDERS}
<option value="{$REPORT_FOLDER->getId()}"
{if $REPORT_FOLDER->getId() eq $REPORT_MODEL->get('folderid')}
diff --git a/layouts/v7/modules/Reports/step2.tpl b/layouts/v7/modules/Reports/step2.tpl
index 71673f7910728d23d16bf3d688be12a5c7f43688..87f683c0ff55e9a171103d9f85cab25cd1b2dcb3 100644
--- a/layouts/v7/modules/Reports/step2.tpl
+++ b/layouts/v7/modules/Reports/step2.tpl
@@ -19,7 +19,7 @@
{if $REPORT_MODEL->get('members')}
<input type="hidden" name="members" value={ZEND_JSON::encode($REPORT_MODEL->get('members'))} />
{/if}
- <input type="hidden" name="folderid" value="{$REPORT_MODEL->get('folderid')}" />
+ <input type="hidden" name="reportfolderid" value="{$REPORT_MODEL->get('reportfolderid')}" />
<input type="hidden" name="description" value="{$REPORT_MODEL->get('description')}" />
<input type="hidden" name="primary_module" value="{$PRIMARY_MODULE}" />
<input type="hidden" name="secondary_modules" value={ZEND_JSON::encode($SECONDARY_MODULES)} />
diff --git a/layouts/v7/modules/Reports/step3.tpl b/layouts/v7/modules/Reports/step3.tpl
index a301821e956e9d72ae3b6857087f434595f941c3..e11086e55277b6a179ce642e9adec86ef32ae6f4 100644
--- a/layouts/v7/modules/Reports/step3.tpl
+++ b/layouts/v7/modules/Reports/step3.tpl
@@ -18,7 +18,7 @@
{if $REPORT_MODEL->get('members')}
<input type="hidden" name="members" value={ZEND_JSON::encode($REPORT_MODEL->get('members'))} />
{/if}
- <input type="hidden" name="folderid" value="{$REPORT_MODEL->get('folderid')}" />
+ <input type="hidden" name="reportfolderid" value="{$REPORT_MODEL->get('reportfolderid')}" />
<input type="hidden" name="reports_description" value="{Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('description'))}" />
<input type="hidden" name="primary_module" value="{$PRIMARY_MODULE}" />
<input type="hidden" name="secondary_modules" value={ZEND_JSON::encode($SECONDARY_MODULES)} />
diff --git a/modules/Reports/actions/ChartSave.php b/modules/Reports/actions/ChartSave.php
index 0268ffcf8243b56dc5ba32bbcb6ba0431e6bb47d..d14ce3e37d5450dc806ac001a04602aec729a25f 100644
--- a/modules/Reports/actions/ChartSave.php
+++ b/modules/Reports/actions/ChartSave.php
@@ -21,7 +21,7 @@ class Reports_ChartSave_Action extends Reports_Save_Action {
}
$reportModel->set('reportname', $request->get('reportname'));
- $reportModel->set('folderid', $request->get('folderid'));
+ $reportModel->set('folderid', $request->get('reportfolderid'));
$reportModel->set('description', $request->get('reports_description'));
$reportModel->set('members', $request->get('members'));
diff --git a/modules/Reports/actions/Save.php b/modules/Reports/actions/Save.php
index c2bb8b71fe7fd54c4f6bcf99c12a77f74fa8158b..a3d98c892b9a9c7341a2588120b899bef9fd4d62 100644
--- a/modules/Reports/actions/Save.php
+++ b/modules/Reports/actions/Save.php
@@ -42,7 +42,7 @@ class Reports_Save_Action extends Vtiger_Save_Action {
$reporttype = $request->get('reporttype');
if(empty($reporttype)) $reporttype='tabular';
$reportModel->set('reportname', $request->get('reportname'));
- $reportModel->set('folderid', $request->get('folderid'));
+ $reportModel->set('folderid', $request->get('reportfolderid'));
$reportModel->set('description', $request->get('reports_description'));
$reportModel->set('reporttype', $reporttype);
diff --git a/modules/Reports/models/Folder.php b/modules/Reports/models/Folder.php
index a7e64d2a5db4c7bd8df02c487f8f7b6847353b19..29ade37e3760b4f3e87faf9830966114b4603aad 100644
--- a/modules/Reports/models/Folder.php
+++ b/modules/Reports/models/Folder.php
@@ -283,8 +283,6 @@ class Reports_Folder_Model extends Vtiger_Base_Model {
public function getReportsCount() {
$db = PearDatabase::getInstance();
$params = array();
- global $log;
- $log->fatal('get reports count api');
// To get the report ids which are permitted for the user
$query = "SELECT reportmodulesid, primarymodule from vtiger_reportmodules";
$result = $db->pquery($query, array());
@@ -340,12 +338,6 @@ class Reports_Folder_Model extends Vtiger_Base_Model {
$parentRoleSeq = $currentUserModel->get('parent_role_seq').'::%';
array_push($params, $currentUserId, $currentUserId, $parentRoleSeq);
}
- $log->fatal('Final query params are => ');
- $log->fatal($params);
- $log->fatal('sql query is => ');
- $log->fatal($sql);
- $log->fatal('Converted query is => ');
- $log->fatal($db->convert2sql($sql, $params));
$result = $db->pquery($sql, $params);
return $db->query_result($result, 0, 'count');
}