Files: Fixed error when clicking on the Shared folder

Calendar: No more timeout when calling calendar truncate.
Intermesh · Dec 16, 2024 · f1a52ea · f1a52ea
1 parent bf0561a
commit f1a52ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/www/modules/calendar/model/Calendar.php b/www/modules/calendar/model/Calendar.php
@@ -211,6 +211,9 @@ protected function afterSave($wasNew) {
 	 * Remove all events
 	 */
 	public function truncate(){
+		// could take some time on large calendars.
+		set_time_limit(0);
+
 		$events = $this->events;
 
 		foreach($events as $event){

diff --git a/www/modules/files/FileBrowser.js b/www/modules/files/FileBrowser.js
@@ -80,9 +80,10 @@ GO.files.FileBrowser = function(config){
 	this.treePanel.on('click', function(node)	{
 		this.setFolderID(node.id, true);
 		this.cardPanel.show();
-
-		this.folderDetail.load(parseInt(node.id));
-		this.eastPanel.getLayout().setActiveItem(this.folderDetail);
+		if(node.id !== 'shared') {
+			this.folderDetail.load(parseInt(node.id));
+			this.eastPanel.getLayout().setActiveItem(this.folderDetail);
+		}
 	}, this);
 
 	this.treePanel.on('contextmenu', function(node, e){