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

fix: priority always rejected + cleanup form validation #11

Merged
merged 17 commits into from
Apr 23, 2024
Merged

fix: priority always rejected + cleanup form validation #11

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cf379ac
fix: form rejected due to string/int type differences on priority
iMarbot Apr 19, 2024
931e922
Update en.json
iMarbot Apr 19, 2024
909fd61
Use different submit button text for editing resource
iMarbot Apr 19, 2024
3f5ba85
fix typos
iMarbot Apr 19, 2024
3554f28
Remove unnecessary form validation
iMarbot Apr 20, 2024
ce51cfe
Simplify if statements
iMarbot Apr 20, 2024
78b42b4
Show ID as locked field instead of hidden
iMarbot Apr 20, 2024
63f3ee7
Clean up i18n strings
iMarbot Apr 20, 2024
290eab1
Add help text to resource name field
iMarbot Apr 20, 2024
3766b3c
Add min/max values to priority
iMarbot Apr 20, 2024
cd07e1c
Add filter callback function to trim inputs
iMarbot Apr 21, 2024
be3b508
Add validation callback function on resource input
iMarbot Apr 21, 2024
f92dfa2
remove unneeded manual validation
iMarbot Apr 21, 2024
7ca46da
format code
iMarbot Apr 21, 2024
9389ddb
format code
iMarbot Apr 21, 2024
c17340c
code style
iMarbot Apr 21, 2024
cbb3a2a
Apply suggestions from code review
iMarbot Apr 22, 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
8 changes: 4 additions & 4 deletions src/SpecialPage/SpecialResourceLoaderArticles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public function addPageCB( $formData ) {
. '</div>'
);
$store = false;
} elseif ( !is_int( $formData[ 'Priority' ] ) ) {
} elseif ( !ctype_digit( $formData[ 'Priority' ] ) ) {
iMarbot marked this conversation as resolved.
Show resolved Hide resolved
$output->addWikiTextAsContent(
'<div class="error">'
. $this->msg( 'resourceloaderarticles-error-priority-invalid' )->text()
Expand All @@ -205,7 +205,7 @@ public function addPageCB( $formData ) {
'rla_page' => $formData[ 'Page' ],
'rla_wiki' => $formData[ 'Wiki' ],
'rla_type' => $formData[ 'Type' ],
'rla_priority' => $formData[ 'Priority' ]
'rla_priority' => intval( $formData[ 'Priority' ] )
]
);
$output->addWikiTextAsContent(
Expand Down Expand Up @@ -309,7 +309,7 @@ public function editPageCB( $formData ) {
. '</div>'
);
$store = false;
} elseif ( !is_int( $formData[ 'Priority' ] ) ) {
} elseif ( !ctype_digit( $formData[ 'Priority' ] ) ) {
$output->addWikiTextAsContent(
'<div class="error">'
. $this->msg( 'resourceloaderarticles-error-priority-invalid' )->text()
Expand All @@ -325,7 +325,7 @@ public function editPageCB( $formData ) {
'rla_page' => $formData[ 'Page' ],
'rla_wiki' => $formData[ 'Wiki' ],
'rla_type' => $formData[ 'Type' ],
'rla_priority' => $formData[ 'Priority' ]
'rla_priority' => intval( $formData[ 'Priority' ] )
],
[
'rla_id' => $formData[ 'Id' ]
Expand Down