Skip to content

Commit 30234e0

Browse files
johnnyqjohnnyq
authored
Merge pull request #1197 from itflow-org/develop
Merge Develop into Master
2 parents 34397fe + 1e98ee8 commit 30234e0

File tree

7 files changed

+27
-16
lines changed

7 files changed

+27
-16
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
This file documents all notable changes made to ITFlow.
44

5+
## [25.03.1]
6+
7+
### Fixed
8+
- Phone number missing in various sections.
9+
- Match Database.
10+
- Client Export Only display licenses users and assets from the selected client only.
11+
512
## [25.03]
613

714
### Fixed

‎ajax/ajax_contact_details.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
$contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code));
2323
$contact_extension = nullable_htmlentities($row['contact_extension']);
2424
$contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']);
25-
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_mobile_country_code));
25+
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code));
2626
$contact_email = nullable_htmlentities($row['contact_email']);
2727
$contact_photo = nullable_htmlentities($row['contact_photo']);
2828
$contact_pin = nullable_htmlentities($row['contact_pin']);

‎ajax/ajax_contact_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
$contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']);
2020
$contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code));
2121
$contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']);
22-
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_mobile_country_code));
22+
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code));
2323
$contact_email = nullable_htmlentities($row['contact_email']);
2424
$contact_pin = nullable_htmlentities($row['contact_pin']);
2525
$contact_photo = nullable_htmlentities($row['contact_photo']);

‎contact_details.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
$contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code));
3333
$contact_extension = nullable_htmlentities($row['contact_extension']);
3434
$contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']);
35-
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_mobile_country_code));
35+
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code));
3636
$contact_email = nullable_htmlentities($row['contact_email']);
3737
$contact_photo = nullable_htmlentities($row['contact_photo']);
3838
$contact_pin = nullable_htmlentities($row['contact_pin']);

‎db.sql‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ CREATE TABLE `asset_interfaces` (
201201
`interface_ip` varchar(200) DEFAULT NULL,
202202
`interface_nat_ip` varchar(200) DEFAULT NULL,
203203
`interface_ipv6` varchar(200) DEFAULT NULL,
204-
`interface_notes` text DEFAULT NULL,
204+
`interface_notes` mediumtext DEFAULT NULL,
205205
`interface_primary` tinyint(1) DEFAULT 0,
206206
`interface_created_at` datetime NOT NULL DEFAULT current_timestamp(),
207207
`interface_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
@@ -224,7 +224,7 @@ DROP TABLE IF EXISTS `asset_notes`;
224224
CREATE TABLE `asset_notes` (
225225
`asset_note_id` int(11) NOT NULL AUTO_INCREMENT,
226226
`asset_note_type` varchar(200) NOT NULL,
227-
`asset_note` text DEFAULT NULL,
227+
`asset_note` mediumtext DEFAULT NULL,
228228
`asset_note_created_by` int(11) NOT NULL,
229229
`asset_note_created_at` datetime NOT NULL DEFAULT current_timestamp(),
230230
`asset_note_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
@@ -459,7 +459,7 @@ DROP TABLE IF EXISTS `client_notes`;
459459
CREATE TABLE `client_notes` (
460460
`client_note_id` int(11) NOT NULL AUTO_INCREMENT,
461461
`client_note_type` varchar(200) NOT NULL,
462-
`client_note` text DEFAULT NULL,
462+
`client_note` mediumtext DEFAULT NULL,
463463
`client_note_created_by` int(11) NOT NULL,
464464
`client_note_created_at` datetime NOT NULL DEFAULT current_timestamp(),
465465
`client_note_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
@@ -639,7 +639,7 @@ DROP TABLE IF EXISTS `contact_notes`;
639639
CREATE TABLE `contact_notes` (
640640
`contact_note_id` int(11) NOT NULL AUTO_INCREMENT,
641641
`contact_note_type` varchar(200) NOT NULL,
642-
`contact_note` text DEFAULT NULL,
642+
`contact_note` mediumtext DEFAULT NULL,
643643
`contact_note_created_by` int(11) NOT NULL,
644644
`contact_note_created_at` datetime NOT NULL DEFAULT current_timestamp(),
645645
`contact_note_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
@@ -782,7 +782,7 @@ DROP TABLE IF EXISTS `custom_links`;
782782
CREATE TABLE `custom_links` (
783783
`custom_link_id` int(11) NOT NULL AUTO_INCREMENT,
784784
`custom_link_name` varchar(200) NOT NULL,
785-
`custom_link_description` text DEFAULT NULL,
785+
`custom_link_description` mediumtext DEFAULT NULL,
786786
`custom_link_uri` varchar(500) NOT NULL,
787787
`custom_link_new_tab` tinyint(1) NOT NULL DEFAULT 0,
788788
`custom_link_icon` varchar(200) DEFAULT NULL,
@@ -1292,7 +1292,7 @@ DROP TABLE IF EXISTS `project_templates`;
12921292
CREATE TABLE `project_templates` (
12931293
`project_template_id` int(11) NOT NULL AUTO_INCREMENT,
12941294
`project_template_name` varchar(200) NOT NULL,
1295-
`project_template_description` text DEFAULT NULL,
1295+
`project_template_description` mediumtext DEFAULT NULL,
12961296
`project_template_created_at` datetime NOT NULL DEFAULT current_timestamp(),
12971297
`project_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
12981298
`project_template_archived_at` datetime DEFAULT NULL,
@@ -1403,14 +1403,14 @@ DROP TABLE IF EXISTS `racks`;
14031403
CREATE TABLE `racks` (
14041404
`rack_id` int(11) NOT NULL AUTO_INCREMENT,
14051405
`rack_name` varchar(200) NOT NULL,
1406-
`rack_description` text DEFAULT NULL,
1406+
`rack_description` mediumtext DEFAULT NULL,
14071407
`rack_model` varchar(200) DEFAULT NULL,
14081408
`rack_depth` varchar(50) DEFAULT NULL,
14091409
`rack_type` varchar(50) DEFAULT NULL,
14101410
`rack_units` int(11) NOT NULL,
14111411
`rack_photo` varchar(200) DEFAULT NULL,
14121412
`rack_physical_location` varchar(200) DEFAULT NULL,
1413-
`rack_notes` text DEFAULT NULL,
1413+
`rack_notes` mediumtext DEFAULT NULL,
14141414
`rack_created_at` datetime NOT NULL DEFAULT current_timestamp(),
14151415
`rack_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
14161416
`rack_archived_at` datetime DEFAULT NULL,
@@ -2175,7 +2175,7 @@ DROP TABLE IF EXISTS `ticket_templates`;
21752175
CREATE TABLE `ticket_templates` (
21762176
`ticket_template_id` int(11) NOT NULL AUTO_INCREMENT,
21772177
`ticket_template_name` varchar(200) NOT NULL,
2178-
`ticket_template_description` text DEFAULT NULL,
2178+
`ticket_template_description` mediumtext DEFAULT NULL,
21792179
`ticket_template_subject` varchar(500) DEFAULT NULL,
21802180
`ticket_template_details` longtext DEFAULT NULL,
21812181
`ticket_template_created_at` datetime NOT NULL DEFAULT current_timestamp(),
@@ -2498,4 +2498,4 @@ CREATE TABLE `vendors` (
24982498
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
24992499
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
25002500

2501-
-- Dump completed on 2025-03-26 11:13:46
2501+
-- Dump completed on 2025-03-29 17:35:17

‎includes/app_version.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* 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.
66
*/
77

8-
DEFINE("APP_VERSION", "25.03");
8+
DEFINE("APP_VERSION", "25.03.1");

‎post/user/client.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@
641641
$contact_phone = nullable_htmlentities(formatPhoneNumber($row["contact_phone"], $contact_phone_country_code));
642642
$contact_extension = nullable_htmlentities($row["contact_extension"]);
643643
$contact_mobile_country_code = nullable_htmlentities($row["contact_mobile_country_code"]);
644-
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row["contact_phone"], $contact_mobile_country_code));
644+
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row["contact_mobile"], $contact_mobile_country_code));
645645
$contact_email = nullable_htmlentities($row["contact_email"]);
646646
$client_website = nullable_htmlentities($row["client_website"]);
647647

@@ -716,6 +716,8 @@
716716
software ON software_contacts.software_id = software.software_id
717717
WHERE software_archived_at IS NULL
718718
AND contact_archived_at IS NULL
719+
AND software_client_id = $client_id
720+
AND contact_client_id = $client_id
719721
ORDER BY
720722
contact_name, software_name;"
721723
);
@@ -732,6 +734,8 @@
732734
software ON software_assets.software_id = software.software_id
733735
WHERE software_archived_at IS NULL
734736
AND asset_archived_at IS NULL
737+
AND software_client_id = $client_id
738+
AND asset_client_id = $client_id
735739
ORDER BY
736740
asset_name, software_name;"
737741
);
@@ -825,7 +829,7 @@
825829
$contact_extension = "x$contact_extension";
826830
}
827831
$contact_mobile_country_code = nullable_htmlentities($row["contact_mobile_country_code"]);
828-
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row["contact_phone"], $contact_mobile_country_code));
832+
$contact_mobile = nullable_htmlentities(formatPhoneNumber($row["contact_mobile"], $contact_mobile_country_code));
829833
$html .= "
830834
<tr>
831835
<td>$contact_name</td>

0 commit comments

Comments
 (0)