Skip to content

block: additional options for partial blocks #2316

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

Open
IlyasLebleu wants to merge 3 commits into
base: master
Choose a base branch
from
Open

block: additional options for partial blocks #2316

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5732f76
block: additional options for partial blocks
IlyasLebleu Feb 11, 2026
03e5d5b
block: reorder create, move, thanks, upload + tooltips
IlyasLebleu Feb 11, 2026
f497f15
maybe some tooltips aren't exactly needed
IlyasLebleu Feb 11, 2026
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
44 changes: 42 additions & 2 deletions src/modules/twinkleblock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,44 @@ Twinkle.block.callback.change_action = function twinkleblockCallbackChangeAction
ns.append({ type: 'option', label: name, value: number });
}
});
const partialblockoptions = [{
Copy link
Copy Markdown
Member

@siddharthvp siddharthvp Feb 12, 2026

Choose a reason for hiding this comment

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

variable can be inlined

checked: Twinkle.block.field_block_options.create,
label: 'Creating pages',
name: 'create',
value: '1',
tooltip: 'Creating new pages and uploading new files'
},
{
checked: Twinkle.block.field_block_options.move,
label: 'Moving pages and files',
Copy link
Copy Markdown
Member

@siddharthvp siddharthvp Feb 12, 2026

Choose a reason for hiding this comment

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

I suggest removing or disabling these options for temp accounts as they can't move or upload or thank anyway.

name: 'move',
value: '1'
},
{
checked: Twinkle.block.field_block_options.thanks,
label: 'Sending thanks',
name: 'thanks',
value: '1'
},
{
checked: Twinkle.block.field_block_options.upload,
label: 'Uploading files',
name: 'upload',
value: '1',
tooltip: 'Uploading files (including overwriting files)'
}];
const pbo = fieldBlockOptions.append({
Copy link
Copy Markdown
Member

@siddharthvp siddharthvp Feb 12, 2026

Choose a reason for hiding this comment

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

should be a descriptive variable name

type: 'div',
name: 'partialblockoptions_label',
label: 'Also block from:',
style: 'margin-bottom:5px;'
});
pbo.append({
type: 'checkbox',
name: 'partialblockoptions',
style: 'display:flex; gap:5px',
list: partialblockoptions
});
}

const blockoptions = [
Expand Down Expand Up @@ -1801,9 +1839,11 @@ Twinkle.block.callback.evaluate = function twinkleblockCallbackEvaluate(e) {
}
templateoptions.pagerestrictions = $form.find('[name=pagerestrictions]').val() || [];
templateoptions.namespacerestrictions = $form.find('[name=namespacerestrictions]').val() || [];

// Format for API here rather than in saveFieldset
blockoptions.pagerestrictions = templateoptions.pagerestrictions.join('|');
blockoptions.namespacerestrictions = templateoptions.namespacerestrictions.join('|');
blockoptions.actionrestrictions = ['create', 'move', 'thanks', 'upload'].filter((option) => Twinkle.block.field_block_options[option]).join('|');

// use block settings as warn options where not supplied
templateoptions.summary = templateoptions.summary || blockoptions.reason;
Expand All @@ -1814,9 +1854,9 @@ Twinkle.block.callback.evaluate = function twinkleblockCallbackEvaluate(e) {
if (blockoptions.disabletalk && !blockoptions.namespacerestrictions.includes('3')) {
return alert('Partial blocks cannot prevent talk page access unless also restricting them from editing User talk space!');
}
if (!blockoptions.namespacerestrictions && !blockoptions.pagerestrictions) {
if (!blockoptions.namespacerestrictions && !blockoptions.pagerestrictions && !blockoptions.actionrestrictions) {
if (!blockoptions.noemail && !blockoptions.nocreate) { // Blank entries technically allowed [[phab:T208645]]
return alert('No pages or namespaces were selected, nor were email or account creation restrictions applied; please select at least one option to apply a partial block!');
return alert('No pages or namespaces were selected, nor were additional restrictions applied; please select at least one option to apply a partial block!');
} else if ((templateoptions.template !== 'uw-epblock' || $form.find('select[name="preset"]').val() !== 'uw-epblock') &&
// Don't require confirmation if email harassment defaults are set
!confirm('You are about to block with no restrictions on page or namespace editing, are you sure you want to proceed?')) {
Expand Down
Loading