fixes: #1129 ::Uma::Reports breaks if condtion on foldername with Documents promary module

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)} >

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)} >

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)} />

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')}

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)} />

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)} />

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'));
 

modules/Reports/actions/Save.php

@@ -30,6 +30,10 @@ class Reports_Save_Action extends Vtiger_Save_Action {
 	}
 
 	public function process(Vtiger_Request $request) {
+        global $log;
+        $log->fatal('Save.php process api');
+        $log->fatal('request is => ');
+        $log->fatal($request);
 		$moduleName = $request->getModule();
 
 		$record = $request->get('record');
@@ -42,7 +46,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);