Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotfix/miscellaneous #225

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Hotfix/miscellaneous #225

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8acc397
fix: fix user edit title
adam-buckley May 2, 2023
b5d3362
Merge remote-tracking branch 'origin/master' into fix/UserEditTitleFix
DerekCrannaford May 3, 2023
9a4ec35
Merge branch 'master' into fix/UserEditTitleFix
dragonflyfree Jun 1, 2023
8bf4361
Fix taskweek.php undefined variable warnings
dragonflyfree Aug 31, 2023
335ce46
Fix edit.php unhandled null
dragonflyfree Aug 31, 2023
61bc26f
Merge pull request #222 from 2pisoftware/fix/CreateReportUnhandledNull
dragonflyfree Dec 3, 2023
37a660a
Merge pull request #223 from 2pisoftware/fix/TaskWeekUndefinedVariables
dragonflyfree Dec 3, 2023
7b9681a
Merge pull request #224 from 2pisoftware/fix/UserEditTitleFix
dragonflyfree Dec 3, 2023
5c82c78
Merge branch 'develop' into hotfix/miscellaneous
dragonflyfree Dec 4, 2023
02ba7a6
Merge branch 'develop' into hotfix/miscellaneous
MaddyUnderStars Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion system/modules/auth/models/Contact.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function getTitle()
public function setTitle($title)
{
if (!empty($title)) {
$title_lookup = LookupService::getInstance($this->w)->getLookupByTypeAndCode('title', $title);
$title_lookup = LookupService::getInstance($this->w)->getLookupByTypeAndCodeV2('title', $title);
if (empty($title_lookup)) {
$title_lookup = new Lookup($this->w);
$title_lookup->fill(['type' => 'title', 'code' => $title, 'title' => $title]);
Expand Down
2 changes: 1 addition & 1 deletion system/modules/report/actions/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function edit_GET(Web &$w)
(new \Html\Form\Select([
"id|name" => "module",
"label" => "Module",
"selected_option" => strtolower($report->module),
"selected_option" => strtolower($report->module ?? ""),
"options" => ReportService::getInstance($w)->getModules(),
])),
(new \Html\Form\Select([
Expand Down
4 changes: 2 additions & 2 deletions system/modules/task/actions/taskweek.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ function taskweek_ALL(Web &$w)
}

// load the search filters
$a = Html::select("assignee", $members, Request::mixed('assignee'));
$a = Html::select("assignee", $members ?? [], Request::mixed('assignee'));
$w->ctx("assignee", $a);

$taskgroups = Html::select("taskgroup", $group, Request::mixed('taskgroup'));
$taskgroups = Html::select("taskgroup", $group ?? [], Request::mixed('taskgroup'));
$w->ctx("taskgroups", $taskgroups);
}
Loading