mirror of
https://github.com/friendica/friendica
synced 2024-12-23 08:40:16 +00:00
Merge pull request #10194 from tobiasd/20210502-admincommand
Admin panel: Add actual command to the worker queue display
This commit is contained in:
Hypolite Petovan
GitHub
commit
af5fa6ce00
4 changed files with 58 additions and 49 deletions
|
|
@ -56,7 +56,7 @@ class Queue extends BaseAdmin
|
||||||
}
|
}
|
||||||
|
|
||||||
// @TODO Move to Model\WorkerQueue::getEntries()
|
// @TODO Move to Model\WorkerQueue::getEntries()
|
||||||
$entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['limit' => 999, 'order' => ['created']]);
|
$entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority', 'command'], $condition, ['limit' => 999, 'order' => ['created']]);
|
||||||
|
|
||||||
$r = [];
|
$r = [];
|
||||||
while ($entry = DBA::fetch($entries)) {
|
while ($entry = DBA::fetch($entries)) {
|
||||||
|
|
@ -73,6 +73,7 @@ class Queue extends BaseAdmin
|
||||||
'$page' => $sub_title,
|
'$page' => $sub_title,
|
||||||
'$count' => count($r),
|
'$count' => count($r),
|
||||||
'$id_header' => DI::l10n()->t('ID'),
|
'$id_header' => DI::l10n()->t('ID'),
|
||||||
|
'$command_header' => DI::l10n()->t('Command'),
|
||||||
'$param_header' => DI::l10n()->t('Job Parameters'),
|
'$param_header' => DI::l10n()->t('Job Parameters'),
|
||||||
'$created_header' => DI::l10n()->t('Created'),
|
'$created_header' => DI::l10n()->t('Created'),
|
||||||
'$prio_header' => DI::l10n()->t('Priority'),
|
'$prio_header' => DI::l10n()->t('Priority'),
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 2021.06-dev\n"
|
"Project-Id-Version: 2021.06-dev\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2021-04-28 23:33+0200\n"
|
"POT-Creation-Date: 2021-05-02 09:56+0200\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -37,7 +37,7 @@ msgstr[1] ""
|
||||||
msgid "Monthly posting limit of %d post reached. The post was rejected."
|
msgid "Monthly posting limit of %d post reached. The post was rejected."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: include/api.php:4503 mod/photos.php:107 mod/photos.php:211
|
#: include/api.php:4518 mod/photos.php:107 mod/photos.php:211
|
||||||
#: mod/photos.php:639 mod/photos.php:1043 mod/photos.php:1060
|
#: mod/photos.php:639 mod/photos.php:1043 mod/photos.php:1060
|
||||||
#: mod/photos.php:1609 src/Model/User.php:1045 src/Model/User.php:1053
|
#: mod/photos.php:1609 src/Model/User.php:1045 src/Model/User.php:1053
|
||||||
#: src/Model/User.php:1061 src/Module/Settings/Profile/Photo/Crop.php:97
|
#: src/Model/User.php:1061 src/Module/Settings/Profile/Photo/Crop.php:97
|
||||||
|
|
@ -54,7 +54,7 @@ msgstr ""
|
||||||
msgid "%1$s poked %2$s"
|
msgid "%1$s poked %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: include/conversation.php:227 src/Model/Item.php:2507
|
#: include/conversation.php:227 src/Model/Item.php:2513
|
||||||
msgid "event"
|
msgid "event"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -62,7 +62,7 @@ msgstr ""
|
||||||
msgid "status"
|
msgid "status"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: include/conversation.php:235 mod/tagger.php:90 src/Model/Item.php:2509
|
#: include/conversation.php:235 mod/tagger.php:90 src/Model/Item.php:2515
|
||||||
msgid "photo"
|
msgid "photo"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -821,7 +821,7 @@ msgstr ""
|
||||||
|
|
||||||
#: mod/api.php:52 mod/api.php:57 mod/dfrn_confirm.php:78 mod/editpost.php:37
|
#: mod/api.php:52 mod/api.php:57 mod/dfrn_confirm.php:78 mod/editpost.php:37
|
||||||
#: mod/events.php:231 mod/follow.php:55 mod/follow.php:135 mod/item.php:184
|
#: mod/events.php:231 mod/follow.php:55 mod/follow.php:135 mod/item.php:184
|
||||||
#: mod/item.php:189 mod/item.php:908 mod/message.php:69 mod/message.php:112
|
#: mod/item.php:189 mod/item.php:909 mod/message.php:69 mod/message.php:112
|
||||||
#: mod/notes.php:44 mod/ostatus_subscribe.php:30 mod/photos.php:176
|
#: mod/notes.php:44 mod/ostatus_subscribe.php:30 mod/photos.php:176
|
||||||
#: mod/photos.php:922 mod/repair_ostatus.php:31 mod/settings.php:47
|
#: mod/photos.php:922 mod/repair_ostatus.php:31 mod/settings.php:47
|
||||||
#: mod/settings.php:65 mod/settings.php:498 mod/suggest.php:34
|
#: mod/settings.php:65 mod/settings.php:498 mod/suggest.php:34
|
||||||
|
|
@ -943,7 +943,7 @@ msgstr ""
|
||||||
msgid "list"
|
msgid "list"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/cal.php:297 src/Console/User.php:183 src/Model/User.php:607
|
#: mod/cal.php:297 src/Console/User.php:188 src/Model/User.php:607
|
||||||
#: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:74
|
#: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:74
|
||||||
#: src/Module/Admin/Users/Index.php:80 src/Module/Admin/Users/Pending.php:71
|
#: src/Module/Admin/Users/Index.php:80 src/Module/Admin/Users/Pending.php:71
|
||||||
#: src/Module/Api/Twitter/ContactEndpoint.php:73
|
#: src/Module/Api/Twitter/ContactEndpoint.php:73
|
||||||
|
|
@ -1433,19 +1433,19 @@ msgstr ""
|
||||||
msgid "Empty post discarded."
|
msgid "Empty post discarded."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/item.php:708
|
#: mod/item.php:709
|
||||||
msgid "Post updated."
|
msgid "Post updated."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/item.php:725 mod/item.php:730
|
#: mod/item.php:726 mod/item.php:731
|
||||||
msgid "Item wasn't stored."
|
msgid "Item wasn't stored."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/item.php:741
|
#: mod/item.php:742
|
||||||
msgid "Item couldn't be fetched."
|
msgid "Item couldn't be fetched."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/item.php:887 src/Module/Admin/Themes/Details.php:39
|
#: mod/item.php:888 src/Module/Admin/Themes/Details.php:39
|
||||||
#: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:47
|
#: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:47
|
||||||
#: src/Module/Debug/ItemBody.php:60
|
#: src/Module/Debug/ItemBody.php:60
|
||||||
msgid "Item not found."
|
msgid "Item not found."
|
||||||
|
|
@ -2095,11 +2095,11 @@ msgstr ""
|
||||||
msgid "Passwords do not match."
|
msgid "Passwords do not match."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/settings.php:281 src/Console/User.php:211
|
#: mod/settings.php:281 src/Console/User.php:216
|
||||||
msgid "Password update failed. Please try again."
|
msgid "Password update failed. Please try again."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/settings.php:284 src/Console/User.php:214
|
#: mod/settings.php:284 src/Console/User.php:219
|
||||||
msgid "Password changed."
|
msgid "Password changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3124,52 +3124,52 @@ msgstr ""
|
||||||
msgid "All pending post updates are done."
|
msgid "All pending post updates are done."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:159 src/Console/User.php:246
|
#: src/Console/User.php:164 src/Console/User.php:251
|
||||||
msgid "Enter user nickname: "
|
msgid "Enter user nickname: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:203
|
#: src/Console/User.php:208
|
||||||
msgid "Enter new password: "
|
msgid "Enter new password: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:238
|
#: src/Console/User.php:243
|
||||||
msgid "Enter user name: "
|
msgid "Enter user name: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:254
|
#: src/Console/User.php:259
|
||||||
msgid "Enter user email address: "
|
msgid "Enter user email address: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:262
|
#: src/Console/User.php:267
|
||||||
msgid "Enter a language (optional): "
|
msgid "Enter a language (optional): "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:287
|
#: src/Console/User.php:292
|
||||||
msgid "User is not pending."
|
msgid "User is not pending."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:319
|
#: src/Console/User.php:324
|
||||||
msgid "User has already been marked for deletion."
|
msgid "User has already been marked for deletion."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:324
|
#: src/Console/User.php:329
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Type \"yes\" to delete %s"
|
msgid "Type \"yes\" to delete %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:326
|
#: src/Console/User.php:331
|
||||||
msgid "Deletion aborted."
|
msgid "Deletion aborted."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:449
|
#: src/Console/User.php:454
|
||||||
msgid "Enter category: "
|
msgid "Enter category: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:459
|
#: src/Console/User.php:464
|
||||||
msgid "Enter key: "
|
msgid "Enter key: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Console/User.php:494
|
#: src/Console/User.php:498
|
||||||
msgid "Enter value: "
|
msgid "Enter value: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3662,39 +3662,39 @@ msgstr ""
|
||||||
msgid "last"
|
msgid "last"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Text/BBCode.php:940 src/Content/Text/BBCode.php:1614
|
#: src/Content/Text/BBCode.php:941 src/Content/Text/BBCode.php:1615
|
||||||
#: src/Content/Text/BBCode.php:1615
|
#: src/Content/Text/BBCode.php:1616
|
||||||
msgid "Image/photo"
|
msgid "Image/photo"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Text/BBCode.php:1062
|
#: src/Content/Text/BBCode.php:1063
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
|
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Text/BBCode.php:1087 src/Model/Item.php:2941
|
#: src/Content/Text/BBCode.php:1088 src/Model/Item.php:2976
|
||||||
#: src/Model/Item.php:2947
|
#: src/Model/Item.php:2982
|
||||||
msgid "link to source"
|
msgid "link to source"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Text/BBCode.php:1532 src/Content/Text/HTML.php:951
|
#: src/Content/Text/BBCode.php:1533 src/Content/Text/HTML.php:951
|
||||||
msgid "Click to open/close"
|
msgid "Click to open/close"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Text/BBCode.php:1563
|
#: src/Content/Text/BBCode.php:1564
|
||||||
msgid "$1 wrote:"
|
msgid "$1 wrote:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Text/BBCode.php:1617 src/Content/Text/BBCode.php:1618
|
#: src/Content/Text/BBCode.php:1618 src/Content/Text/BBCode.php:1619
|
||||||
msgid "Encrypted content"
|
msgid "Encrypted content"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Text/BBCode.php:1831
|
#: src/Content/Text/BBCode.php:1832
|
||||||
msgid "Invalid source protocol"
|
msgid "Invalid source protocol"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Text/BBCode.php:1846
|
#: src/Content/Text/BBCode.php:1847
|
||||||
msgid "Invalid link protocol"
|
msgid "Invalid link protocol"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4822,39 +4822,39 @@ msgstr ""
|
||||||
msgid "Edit groups"
|
msgid "Edit groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:1566
|
#: src/Model/Item.php:1572
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Detected languages in this post:\\n%s"
|
msgid "Detected languages in this post:\\n%s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2511
|
#: src/Model/Item.php:2517
|
||||||
msgid "activity"
|
msgid "activity"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2513 src/Object/Post.php:545
|
#: src/Model/Item.php:2519 src/Object/Post.php:545
|
||||||
msgid "comment"
|
msgid "comment"
|
||||||
msgid_plural "comments"
|
msgid_plural "comments"
|
||||||
msgstr[0] ""
|
msgstr[0] ""
|
||||||
msgstr[1] ""
|
msgstr[1] ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2516
|
#: src/Model/Item.php:2522
|
||||||
msgid "post"
|
msgid "post"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2630
|
#: src/Model/Item.php:2636
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Content warning: %s"
|
msgid "Content warning: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2906
|
#: src/Model/Item.php:2941
|
||||||
msgid "bytes"
|
msgid "bytes"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2935
|
#: src/Model/Item.php:2970
|
||||||
msgid "View on separate page"
|
msgid "View on separate page"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2936
|
#: src/Model/Item.php:2971
|
||||||
msgid "view on separate page"
|
msgid "view on separate page"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5786,14 +5786,18 @@ msgid "ID"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Module/Admin/Queue.php:76
|
#: src/Module/Admin/Queue.php:76
|
||||||
msgid "Job Parameters"
|
msgid "Command"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Module/Admin/Queue.php:77
|
#: src/Module/Admin/Queue.php:77
|
||||||
msgid "Created"
|
msgid "Job Parameters"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Module/Admin/Queue.php:78
|
#: src/Module/Admin/Queue.php:78
|
||||||
|
msgid "Created"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Module/Admin/Queue.php:79
|
||||||
msgid "Priority"
|
msgid "Priority"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -8932,19 +8936,19 @@ msgstr ""
|
||||||
|
|
||||||
#: src/Module/Profile/Profile.php:322 src/Module/Profile/Profile.php:325
|
#: src/Module/Profile/Profile.php:322 src/Module/Profile/Profile.php:325
|
||||||
#: src/Module/Profile/Status.php:65 src/Module/Profile/Status.php:68
|
#: src/Module/Profile/Status.php:65 src/Module/Profile/Status.php:68
|
||||||
#: src/Protocol/Feed.php:945 src/Protocol/OStatus.php:1256
|
#: src/Protocol/Feed.php:943 src/Protocol/OStatus.php:1256
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%s's timeline"
|
msgid "%s's timeline"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Module/Profile/Profile.php:323 src/Module/Profile/Status.php:66
|
#: src/Module/Profile/Profile.php:323 src/Module/Profile/Status.php:66
|
||||||
#: src/Protocol/Feed.php:949 src/Protocol/OStatus.php:1260
|
#: src/Protocol/Feed.php:947 src/Protocol/OStatus.php:1260
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%s's posts"
|
msgid "%s's posts"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Module/Profile/Profile.php:324 src/Module/Profile/Status.php:67
|
#: src/Module/Profile/Profile.php:324 src/Module/Profile/Status.php:67
|
||||||
#: src/Protocol/Feed.php:952 src/Protocol/OStatus.php:1263
|
#: src/Protocol/Feed.php:950 src/Protocol/OStatus.php:1263
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%s's comments"
|
msgid "%s's comments"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -10456,7 +10460,7 @@ msgstr ""
|
||||||
msgid "Show fewer"
|
msgid "Show fewer"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Protocol/Diaspora.php:3464
|
#: src/Protocol/Diaspora.php:3434
|
||||||
msgid "Attachments:"
|
msgid "Attachments:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{{$id_header}}</th>
|
<th>{{$id_header}}</th>
|
||||||
|
<th>{{$command_header}}</th>
|
||||||
<th>{{$param_header}}</th>
|
<th>{{$param_header}}</th>
|
||||||
<th>{{$created_header}}</th>
|
<th>{{$created_header}}</th>
|
||||||
<th>{{$prio_header}}</th>
|
<th>{{$prio_header}}</th>
|
||||||
|
|
@ -12,6 +13,7 @@
|
||||||
{{foreach $entries as $e}}
|
{{foreach $entries as $e}}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{$e.id}}</td>
|
<td>{{$e.id}}</td>
|
||||||
|
<td>{{$e.command}}</td>
|
||||||
<td>{{$e.parameter}}</td>
|
<td>{{$e.parameter}}</td>
|
||||||
<td>{{$e.created}}</td>
|
<td>{{$e.created}}</td>
|
||||||
<td>{{$e.priority}}</td>
|
<td>{{$e.priority}}</td>
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<tr>
|
<tr>
|
||||||
<th>{{$id_header}}</th>
|
<th>{{$id_header}}</th>
|
||||||
|
<th>{{$command_header}}</th>
|
||||||
<th>{{$param_header}}</th>
|
<th>{{$param_header}}</th>
|
||||||
<th>{{$created_header}}</th>
|
<th>{{$created_header}}</th>
|
||||||
<th>{{$prio_header}}</th>
|
<th>{{$prio_header}}</th>
|
||||||
|
|
@ -12,6 +13,7 @@
|
||||||
{{foreach $entries as $e}}
|
{{foreach $entries as $e}}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{$e.id}}</td>
|
<td>{{$e.id}}</td>
|
||||||
|
<td>{{$e.command}}</td>
|
||||||
<td>{{$e.parameter}}</td>
|
<td>{{$e.parameter}}</td>
|
||||||
<td>{{$e.created}}</td>
|
<td>{{$e.created}}</td>
|
||||||
<td>{{$e.priority}}</td>
|
<td>{{$e.priority}}</td>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue