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

Fix alignment of Email field and Dynamic rowspan #18859

Open
wants to merge 4 commits into
base: 10.0/bugfixes
Choose a base branch
from
Open

Fix alignment of Email field and Dynamic rowspan #18859

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e8e91a
Fix alignment of Email field and Dynamic rowspan
eduardomozart Jan 30, 2025
8dae7ee
Update User.php
eduardomozart Jan 30, 2025
ebd996b
Update User.php
eduardomozart Feb 5, 2025
2d4ea62
Update User.php
eduardomozart Feb 5, 2025
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
6 changes: 5 additions & 1 deletion src/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2779,6 +2779,8 @@ public function showForm($ID, array $options = [])
. sprintf(__('Run the "%1$s" command to activate it.'), 'php bin/console database:enable_timezones');
}
echo "</td></tr>";
} else {
echo "<tr class='tab_bg_1'><td colspan='2'></td></tr>";
}

echo "<tr class='tab_bg_1'>";
Expand Down Expand Up @@ -3271,6 +3273,8 @@ public function showMyForm($target, $ID)
echo "<td colspan='2'></td>";
}
echo "</tr>";
} else {
echo "<tr class='tab_bg_1'><td colspan='2'></td></tr>";
Comment on lines +3276 to +3277
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result seems to be different depending on the following condition : if ($extauth|| !Session::haveRight("password_update", "1")) {. Indeed the code from line 3267 to 3272 seems to indicate that it may require an additional placeholder.

Could you check ?

}

$phonerand = mt_rand();
Expand All @@ -3291,7 +3295,7 @@ public function showMyForm($target, $ID)
);
}
echo "</td>";
echo "<td class='top'>" . _n('Email', 'Emails', Session::getPluralNumber());
echo "<td class='top align-middle'>" . _n('Email', 'Emails', Session::getPluralNumber());
UserEmail::showAddEmailButton($this);
echo "</td><td>";
UserEmail::showForUser($this);
Expand Down