Merge pull request #468 from AlexKay85/master

fix for broken pagination
berliCRM · Nov 19, 2020 · 623d365 · 623d365
2 parents 9883bc3 + 71462f1
commit 623d365
Show file tree

Hide file tree

Showing 13 changed files with 202 additions and 173 deletions.
diff --git a/db_update.php b/db_update.php
@@ -378,15 +378,29 @@
 		closedir($handle);
 	}
 }
-if (version_compare($installedtag, $current_release_tag) < 0) {
-	echo 'module update berliSoftphones done <br>';
+echo 'module update berliSoftphones done <br>';
 
+if (version_compare($installedtag, $current_release_tag) < 0) {
 	echo 'Add INDEX to vtiger_email_track<br>';
 	$query = "ALTER TABLE `vtiger_email_track` ADD INDEX (`mailid`);";
 	$adb->pquery($query, array());
 	echo 'Adding INDEX done<br>';
 }
 
+echo 'module update berliWidgets start<br>';
+$moduleInstance = Vtiger_Module::getInstance("berliWidgets");
+if($moduleInstance) {
+	updateVtlibModule("berliWidgets", "packages/vtiger/mandatory/berliCleverReach.zip");
+}
+echo 'module update berliWidgets done<br>';
+
+echo 'module update berliCleverReach start<br>';
+$moduleInstance = Vtiger_Module::getInstance("berliCleverReach");
+if($moduleInstance) {
+	updateVtlibModule("berliCleverReach", "packages/vtiger/optional/berliCleverReach.zip");
+}
+echo 'module update berliCleverReach done<br>';
+
 $query = "UPDATE `vtiger_version` SET `tag_version` = ?";
 $adb->pquery($query, array($current_release_tag));
 echo "<h2>Finished updating to $current_release_tag!</h2>";
diff --git a/layouts/vlayout/modules/Vtiger/dashboards/HistoryContents.tpl b/layouts/vlayout/modules/Vtiger/dashboards/HistoryContents.tpl
diff --git a/layouts/vlayout/modules/Vtiger/resources/dashboards/Widget.js b/layouts/vlayout/modules/Vtiger/resources/dashboards/Widget.js
@@ -308,7 +308,7 @@ Vtiger_Widget_Js('Vtiger_History_Widget_Js', {}, {
 			});
 			AppConnector.request(params).then(function(data){
 				refreshContainer.progressIndicator({'mode': 'hide'});
-				loadMoreHandler.replaceWith(data);
+				loadMoreHandler.parent().parent().replaceWith(data);
 				thisInstance.registerLoadMore();
 			}, function(){
 				refreshContainer.progressIndicator({'mode': 'hide'});

diff --git a/modules/Vtiger/views/RelatedList.php b/modules/Vtiger/views/RelatedList.php
@@ -67,10 +67,6 @@ function process(Vtiger_Request $request) {
 			$viewer->assign('TOTAL_ENTRIES', $totalCount);
 			$viewer->assign('PERFORMANCE', true);
 		}
-		else {
-			$viewer->assign('PAGE_COUNT', '1');
-			$viewer->assign('PERFORMANCE', false);
-		}
 
 		$viewer->assign('MODULE', $moduleName);
 		$viewer->assign('PAGING', $pagingModel);

diff --git a/packages/vtiger/mandatory/berliWidgets.zip b/packages/vtiger/mandatory/berliWidgets.zip
diff --git a/packages/vtiger/optional/berliCleverReach.zip b/packages/vtiger/optional/berliCleverReach.zip
diff --git a/pkg/vtiger/modules/berliCleverReach/manifest.xml b/pkg/vtiger/modules/berliCleverReach/manifest.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <module>
-<exporttime>2019-10-08 13:43:08</exporttime>
+<exporttime>2020-11-18 07:43:08</exporttime>
 <name>berliCleverReach</name>
 <label>CleverReach</label>
 <parent>Marketing</parent>
-<version>0.95</version>
+<version>0.96</version>
 <dependencies>
 <vtiger_version>6.5.0</vtiger_version>
 <vtiger_max_version>6.*</vtiger_max_version>

diff --git a/pkg/vtiger/modules/berliCleverReach/modules/berliCleverReach/providers/cleverreach.php b/pkg/vtiger/modules/berliCleverReach/modules/berliCleverReach/providers/cleverreach.php
@@ -100,8 +100,8 @@ public function createCleverReachAttributes() {
         // creating attributes for the first time can take MINUTES after an successful API request
         foreach ($fieldsneeded as $fieldname => $fieldtype)	{
             if (isset($tmpfields[$fieldname]) && $tmpfields[$fieldname] != $fieldtype) {
-                throw new Exception('{"status":"error","message":"Cannot change type of attribute $fieldname to $fieldtype"}');
-            }
+               throw new Exception('{"status":"error","message":"Cannot change type of attribute '.$fieldname.' to '.$fieldtype.'"}');
+             }
             else {
                 $newfield = array("name"=>$fieldname, "type"=>$fieldtype);
                 $this->rest->post("/attributes", $newfield);

diff --git a/pkg/vtiger/modules/berliWidgets/languages/de_de/berliWidgets.php b/pkg/vtiger/modules/berliWidgets/languages/de_de/berliWidgets.php
@@ -3,7 +3,9 @@
 	'berliWidgets' => 'berliWidgets',
 	'LBL_RELATED_TO' => 'bezogen auf',
 	'LBL_NO_RECORDS' => 'keine Daten',
-
+	'LBL_WRITE_ACCESS_FOR' => 'Sie haben keine Erstellrechte für ',
+	'LBL_MODULE_DENIED' => 'Der Modulzugang ist gesperrt.',
+	'LBL_PROBLEM_UPLOAD' => 'Es gab ein Update Problem, bitte die Seite neu laden und nochmal versuchen.',
 );
 
 ?>
diff --git a/pkg/vtiger/modules/berliWidgets/languages/en_us/berliWidgets.php b/pkg/vtiger/modules/berliWidgets/languages/en_us/berliWidgets.php
@@ -3,7 +3,9 @@
 	'berliWidgets' => 'berliWidgets',
 	'LBL_RELATED_TO' => 'related to',
 	'LBL_NO_RECORDS' => 'no data',
-
+	'LBL_WRITE_ACCESS_FOR' => 'You do not have create privileges for ',
+	'LBL_MODULE_DENIED' => 'The module access is denied.',
+	'LBL_PROBLEM_UPLOAD' => 'There has been an upload problem. Please reload the page an try again.',
 );
 
 ?>
diff --git a/pkg/vtiger/modules/berliWidgets/manifest.xml b/pkg/vtiger/modules/berliWidgets/manifest.xml
@@ -5,7 +5,7 @@
 	<label>berliWidgets</label>
 	<parent></parent>
 	<type>extension</type>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<dependencies>
 		<vtiger_version>6.5.0</vtiger_version>
 		<vtiger_max_version>6.*</vtiger_max_version>

diff --git a/pkg/vtiger/modules/berliWidgets/modules/berliWidgets/actions/saveDroppedDocument.php b/pkg/vtiger/modules/berliWidgets/modules/berliWidgets/actions/saveDroppedDocument.php
@@ -19,6 +19,7 @@ public function checkPermission(Vtiger_Request $request) {
 	}
 
 	public function process(Vtiger_Request $request) {
+		global $currentModule;
 		$db = PearDatabase::getInstance();
 		$current_user = Users_Record_Model::getCurrentUserModel();
 		$parentid = $request->get('recordid');

diff --git a/vtlib/tools/console.php b/vtlib/tools/console.php
@@ -291,6 +291,16 @@ protected function create($moduleInformation) {
 		$field4->displaytype= 2;
 		$block->addField($field4);
 
+		$field5 = new Vtiger_Field();
+		$field5->name = 'modifiedby';
+		$field5->label= 'Last Modified By';
+		$field5->table = 'vtiger_crmentity';
+		$field5->column = 'modifiedby';
+		$field5->uitype = 52;
+		$field5->typeofdata = 'V~O';
+		$field5->displaytype= 3;
+		$block->addField($field5);
+
 		// Create default custom filter (mandatory)
 		$filter1 = new Vtiger_Filter();
 		$filter1->name = 'All';