added search in ticket descrption and attachements extensions

szpitalnicy · Jul 10, 2019 · e5c1441 · e5c1441
1 parent c9605e9
commit e5c1441
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 9 deletions.
diff --git a/admin/controllers/ticket.php b/admin/controllers/ticket.php
@@ -130,7 +130,7 @@ protected function postSaveHook(JModelLegacy $model, $validData = array())
 		parent::postSaveHook($model, $validData);
 		//Upload file : Attachment
 		self::updateFileField($model, 'attachment', array(
-			'extensions' => ''
+			'extensions' => 'bmp|bmp|doc|gif|html|jpg|jpeg|pdf|png|rtf|tar.gz|tiff|txt|zip'
 		));
 	}
 

diff --git a/admin/helpers/file.php b/admin/helpers/file.php
@@ -73,7 +73,21 @@ class OmhelpdeskCkHelperFile
 	*
 	* @var array
 	*/
-	protected static $mimesTable = array();
+	protected static $mimesTable = array(
+		'bmp' => 'image/vnd.wap.wbmp',
+		'doc' => 'application/msword',
+		'gif' => 'image/gif',
+		'html' => 'text/html',
+		'jpg' => 'image/jpeg',
+		'jpeg' => 'image/jpeg',
+		'pdf' => 'application/pdf',
+		'png' => 'image/png',
+		'rtf' => 'text/rtf',
+		'tar.gz' => 'application/x-gzip',
+		'tiff' => 'image/tiff',
+		'txt' => 'text/plain',
+		'zip' => 'application/x-zip'
+	);
 
 	/**
 	* Create the folders and protect directory with index.html empty file.

diff --git a/admin/models/ticket.php b/admin/models/ticket.php
@@ -77,6 +77,13 @@ public function delete(&$pks)
 			if (!count( $pks ))
 				return true;
 
+			//Integrity : delete the files associated to this deleted item
+			if (!$this->deleteFiles($pks, array(
+													'attachment' => 'trash'
+												))){
+				JError::raiseWarning( 1303, JText::_("OMHELPDESK_ALERT_ERROR_ON_DELETE_FILES") );
+				return false;
+			}
 
 			if (!parent::delete($pks))
 				return false;

diff --git a/extensions/plg_search_omhelpdesk/omhelpdesk.xml b/extensions/plg_search_omhelpdesk/omhelpdesk.xml
@@ -3,7 +3,7 @@
 <extension type="plugin" version="3.0" method="upgrade" group="search">
 	<name><![CDATA[Search - OM Helpdesk]]></name>
 	<author><![CDATA[Marcin Krasucki]]></author>
-	<creationDate><![CDATA[08 Jul 2019]]></creationDate>
+	<creationDate><![CDATA[10 Jul 2019]]></creationDate>
 	<copyright><![CDATA[]]></copyright>
 	<authorEmail><![CDATA[marcin.krasucki@at@intuigo.pl]]></authorEmail>
 	<authorUrl><![CDATA[openmed.io]]></authorUrl>

diff --git a/site/controllers/ticket.php b/site/controllers/ticket.php
@@ -325,7 +325,7 @@ protected function postSaveHook(JModelLegacy $model, $validData = array())
 		parent::postSaveHook($model, $validData);
 		//Upload file : Attachment
 		self::updateFileField($model, 'attachment', array(
-			'extensions' => ''
+			'extensions' => 'bmp|bmp|doc|gif|html|jpg|jpeg|pdf|png|rtf|tar.gz|tiff|txt|zip'
 		));
 	}
 

diff --git a/site/models/forms/ticket.xml b/site/models/forms/ticket.xml
@@ -75,7 +75,7 @@
 				indirect="false"
 				root="[DIR_TICKETS_ATTACHMENT]"
 				actions="remove|thumbs|trash|delete"
-				allowedExtensions=""/>
+				allowedExtensions="*.bmp|*.bmp|*.doc|*.gif|*.html|*.jpg|*.jpeg|*.pdf|*.png|*.rtf|*.tar.gz|*.tiff|*.txt|*.zip"/>
 
 		<field name="hours_of_work"
 				alias="hours_of_work"
@@ -144,7 +144,7 @@
 				indirect="false"
 				root="[DIR_TICKETS_ATTACHMENT]"
 				actions="remove|thumbs|trash|delete"
-				allowedExtensions=""/>
+				allowedExtensions="*.bmp|*.bmp|*.doc|*.gif|*.html|*.jpg|*.jpeg|*.pdf|*.png|*.rtf|*.tar.gz|*.tiff|*.txt|*.zip"/>
 	</fieldset>
 
 	<fieldset name="default.filters" addfieldpath="/administrator/components/com_omhelpdesk/models/fields">

diff --git a/site/models/ticket.php b/site/models/ticket.php
@@ -77,6 +77,13 @@ public function delete(&$pks)
 			if (!count( $pks ))
 				return true;
 
+			//Integrity : delete the files associated to this deleted item
+			if (!$this->deleteFiles($pks, array(
+													'attachment' => 'trash'
+												))){
+				JError::raiseWarning( 1303, JText::_("OMHELPDESK_ALERT_ERROR_ON_DELETE_FILES") );
+				return false;
+			}
 
 			if (!parent::delete($pks))
 				return false;

diff --git a/site/models/tickets.php b/site/models/tickets.php
@@ -216,14 +216,14 @@ protected function ormSearchPlugin()
 		$this->orm(array(
 			'select' => array(
 				'done' => 'title',
-				"{done} {title} {pilot.pilots_name}" => 'text',
+				"{done} {title} {pilot.pilots_name} {description}" => 'text',
 			),
 
 			'search' => array(
 
 				'plugin' => array(
 					'on' => array(
-						'{done} {title} {pilot.pilots_name}' => $method,
+						'{done} {title} {pilot.pilots_name} {description}' => $method,
 					),
 				),
 			),
@@ -333,7 +333,8 @@ protected function prepareQuery(&$query)
 		$this->orm->search('search', array(
 			'on' => array(
 				'title' => 'like',
-				'pilot.pilots_name' => 'like'
+				'pilot.pilots_name' => 'like',
+				'description' => 'like'
 			)
 		));