Merge pull request #1163 from itflow-org/develop

Release 25.01.3

Author: johnnyq

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file documents all notable changes made to ITFlow.
 
+## [25.01.3]
+### Fixed
+- Fixed ticket assignment modal showing client contacts.
+
 ## [25.01.2]
 ### Fixed
 - Fixed app version.

guest/guest_footer.php

@@ -22,6 +22,7 @@
   <script src='../plugins/select2/js/select2.min.js'></script>
   <script src='../plugins/inputmask/inputmask.min.js'></script>
   <script src="../js/app.js"></script>
+  <script src="../js/pretty_content.js"></script>
   <script src="../js/confirm_modal.js"></script>
 
   </body>

guest/guest_view_item.php

@@ -132,7 +132,7 @@
     $doc_content = $purifier->purify($doc_row['document_content']);
 
     echo "<h3>$doc_title</h3>";
-    echo $doc_content;
+    echo "<div class='prettyContent'>$doc_content</div>";
 
     // Update document view count
     $new_item_views = $item_views + 1;

includes/app_version.php

@@ -5,4 +5,4 @@
  * Update this file each time we merge develop into master. Format is YY.MM (add a .v if there is more than one release a month.
  */
 
-DEFINE("APP_VERSION", "25.01.2");
+DEFINE("APP_VERSION", "25.01.3");

modals/ticket_assign_modal.php

@@ -23,7 +23,7 @@
                                 <?php
                                 $sql_users_select = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
                                     LEFT JOIN user_settings on users.user_id = user_settings.user_id
-                                    AND user_type = 1
+                                    WHERE user_type = 1
                                     AND user_archived_at IS NULL
                                     ORDER BY user_name DESC"
                                 );