james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added shortcut-key support to bulk action extension

Browse Source
This commit is contained in:
Matthew Barbour 2019-06-26 22:41:42 -05:00 committed by Shish
parent a82fb56063
commit c4111cc948
7 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ext/bulk_actions/main.php
View File

@ -16,22 +16,29 @@ class BulkActionBlockBuildingEvent extends Event
public $search_terms = []; public $search_terms = [];
public function add_action(String $action, string $button_text, String $confirmation_message = "", String $block = "", int $position = 40) public function add_action(String $action, string $button_text, string $access_key = null, String $confirmation_message = "", String $block = "", int $position = 40)
{ {
if ($block == null) { if ($block == null) {
$block = ""; $block = "";
} }
array_push( if(!empty($access_key)) {
$this->actions, assert(strlen($access_key)==1);
[ foreach ($this->actions as $existing) {
if($existing["access_key"]==$access_key) {
throw new SCoreException("Access key $access_key is already in use");
}
}
}
$this->actions[] =[
"block" => $block, "block" => $block,
"access_key" => $access_key,
"confirmation_message" => $confirmation_message, "confirmation_message" => $confirmation_message,
"action" => $action, "action" => $action,
"button_text" => $button_text, "button_text" => $button_text,
"position" => $position "position" => $position
] ];
);
} }
} }
@ -79,15 +86,22 @@ class BulkActions extends Extension
global $user; global $user;
if ($user->can("delete_image")) { if ($user->can("delete_image")) {
$event->add_action("bulk_delete", "Delete", "Delete selected images?", "", 10); $event->add_action("bulk_delete", "(D)elete", "d", "Delete selected images?", "", 10);
} }
if ($user->can("bulk_edit_image_tag")) { if ($user->can("bulk_edit_image_tag")) {
$event->add_action("bulk_tag", "Tag", "", $this->theme->render_tag_input(), 10);
$event->add_action(
"bulk_tag",
"Tag",
"t",
"",
$this->theme->render_tag_input(),
10);
} }
if ($user->can("bulk_edit_image_source")) { if ($user->can("bulk_edit_image_source")) {
$event->add_action("bulk_source", "Set Source", "", $this->theme->render_source_input(), 10); $event->add_action("bulk_source", "Set (S)ource", "s","", $this->theme->render_source_input(), 10);
} }
} }

8
ext/bulk_actions/theme.php
View File

@ -2,14 +2,14 @@
class BulkActionsTheme extends Themelet class BulkActionsTheme extends Themelet
{ {
public function display_selector(Page $page, $actions, $query) public function display_selector(Page $page, array $actions, string $query)
{ {
global $user; global $user;
$body = "<input type='hidden' name='bulk_selected_ids' id='bulk_selected_ids' /> $body = "<input type='hidden' name='bulk_selected_ids' id='bulk_selected_ids' />
<input id='bulk_selector_activate' type='button' onclick='activate_bulk_selector();' value='Activate Selector'/> <input id='bulk_selector_activate' type='button' onclick='activate_bulk_selector();' value='Activate (M)anual Select' accesskey='m'/>
<div id='bulk_selector_controls' style='display: none;'> <div id='bulk_selector_controls' style='display: none;'>
<input id='bulk_selector_deactivate' type='button' onclick='deactivate_bulk_selector();' value='Deactivate Selector'/> <input id='bulk_selector_deactivate' type='button' onclick='deactivate_bulk_selector();' value='Deactivate (M)anual Select' accesskey='m'/>
Click on images to mark them. Click on images to mark them.
<br /> <br />
<table><tr><td> <table><tr><td>
@ -36,7 +36,7 @@ class BulkActionsTheme extends Themelet
"<input type='hidden' name='bulk_selected_ids' />" . "<input type='hidden' name='bulk_selected_ids' />" .
"<input type='hidden' name='bulk_action' value='" . $action["action"] . "' />" . "<input type='hidden' name='bulk_action' value='" . $action["action"] . "' />" .
$action["block"] . $action["block"] .
"<input type='submit' name='submit_button' value='" . $action["button_text"] . "'/>" . "<input type='submit' name='submit_button' accesskey='{$action["access_key"]}' value='" . $action["button_text"] . "'/>" .
"</form></div>"; "</form></div>";
} }

4
ext/pools/main.php
View File

@ -415,8 +415,8 @@ class Pools extends Extension
$pools = $database->get_all("SELECT * FROM pools ORDER BY title "); $pools = $database->get_all("SELECT * FROM pools ORDER BY title ");
$event->add_action("bulk_pool_add_existing", "Add To Pool", "", $this->theme->get_bulk_pool_selector($pools)); $event->add_action("bulk_pool_add_existing", "Add To (P)ool", "p","", $this->theme->get_bulk_pool_selector($pools));
$event->add_action("bulk_pool_add_new", "Create Pool", "", $this->theme->get_bulk_pool_input()); $event->add_action("bulk_pool_add_new", "Create Pool", "","", $this->theme->get_bulk_pool_input());
} }
public function onBulkAction(BulkActionEvent $event) public function onBulkAction(BulkActionEvent $event)

8
ext/rating/main.php
View File

@ -169,8 +169,8 @@ class Ratings extends Extension
{ {
global $user; global $user;
if ($user->is_admin()) { if ($user->can("bulk_edit_image_rating")) {
$event->add_action("bulk_rate", "Set Rating", "", $this->theme->get_selection_rater_html("u", "bulk_rating")); $event->add_action("bulk_rate","Set (R)ating", "r","",$this->theme->get_selection_rater_html("u","bulk_rating"));
} }
} }
@ -183,7 +183,7 @@ class Ratings extends Extension
if (!isset($_POST['bulk_rating'])) { if (!isset($_POST['bulk_rating'])) {
return; return;
} }
if ($user->is_admin()) { if ($user->can("bulk_edit_image_rating")) {
$rating = $_POST['bulk_rating']; $rating = $_POST['bulk_rating'];
$total = 0; $total = 0;
foreach ($event->items as $id) { foreach ($event->items as $id) {
@ -206,7 +206,7 @@ class Ratings extends Extension
global $user, $page; global $user, $page;
if ($event->page_matches("admin/bulk_rate")) { if ($event->page_matches("admin/bulk_rate")) {
if (!$user->is_admin()) { if (!$user->can("bulk_edit_image_rating")) {
throw new PermissionDeniedException(); throw new PermissionDeniedException();
} else { } else {
$n = 0; $n = 0;

2
ext/regen_thumb/main.php
View File

@ -69,7 +69,7 @@ class RegenThumb extends Extension
global $user; global $user;
if ($user->can("delete_image")) { if ($user->can("delete_image")) {
$event->add_action("bulk_regen", "Regen Thumbnails", "", $this->theme->bulk_html()); $event->add_action("bulk_regen", "Regen Thumbnails", "","", $this->theme->bulk_html());
} }
} }

11
ext/transcode/main.php
View File

@ -12,6 +12,15 @@
* If and image is uanble to be transcoded for any reason, the upload will continue unaffected. * If and image is uanble to be transcoded for any reason, the upload will continue unaffected.
*/ */
class TranscodeConfig
{
const ENGINE = "transcode_engine";
const ENABLED = "transcode_enabled";
const UPLOAD = "transcode_upload";
const UPLOAD_PREFIX = "transcode_upload_";
const QUALITY = "transcode_quality";
}
/* /*
* This is used by the image transcoding code when there is an error while transcoding * This is used by the image transcoding code when there is an error while transcoding
*/ */
@ -221,7 +230,7 @@ class TranscodeImage extends Extension
$engine = $config->get_string("transcode_engine"); $engine = $config->get_string("transcode_engine");
if ($user->is_admin()) { if ($user->is_admin()) {
$event->add_action("bulk_transcode", "Transcode", "", $this->theme->get_transcode_picker_html($this->get_supported_output_formats($engine))); $event->add_action(self::ACTION_BULK_TRANSCODE, "Transcode", null,"", $this->theme->get_transcode_picker_html($this->get_supported_output_formats($engine)));
} }
} }

2
ext/trash/main.php
View File

@ -124,7 +124,7 @@ class Trash extends Extension
global $user; global $user;
if ($user->can("view_trash")&&in_array("in:trash", $event->search_terms)) { if ($user->can("view_trash")&&in_array("in:trash", $event->search_terms)) {
$event->add_action("bulk_trash_restore","Restore From Trash"); $event->add_action("bulk_trash_restore","(U)ndelete", "u");
} }
} }