Skip to content

Commit 5ef1cfd

Browse files
authored
[5.4] Author None and Created by me filter (joomla#45232)
Signed-off-by: BrianTeeman <[email protected]>
1 parent ffe1acf commit 5ef1cfd

File tree

11 files changed

+14
-8
lines changed

11 files changed

+14
-8
lines changed

administrator/components/com_content/forms/filter_articles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
hint="JOPTION_SELECT_AUTHOR"
7676
class="js-select-submit-on-change"
7777
>
78-
<option value="0">JNONE</option>
78+
<option value="0">JNONE_FILTER</option>
7979
<option value="by_me">COM_CONTENT_FILTER_AUTHORS_BY_ME</option>
8080
</field>
8181

administrator/components/com_content/forms/filter_featured.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
hint="JOPTION_SELECT_AUTHOR"
6262
class="js-select-submit-on-change"
6363
>
64-
<option value="0">JNONE</option>
64+
<option value="0">JNONE_FILTER</option>
65+
<option value="by_me">COM_CONTENT_FILTER_AUTHORS_BY_ME</option>
6566
</field>
6667

6768
<field

administrator/components/com_content/tmpl/articles/default.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
<?php echo $this->escape($item->author_name); ?>
327327
</a>
328328
<?php else : ?>
329-
<?php echo Text::_('JNONE'); ?>
329+
[ <?php echo Text::_('JNONE'); ?> ]
330330
<?php endif; ?>
331331
<?php if ($item->created_by_alias) : ?>
332332
<div class="smallsub"><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>

administrator/components/com_content/tmpl/articles/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
class="multipleAuthors"
4747
filter="array"
4848
>
49-
<option value="0">JNONE</option>
49+
<option value="0">JNONE_FILTER</option>
5050
<option value="by_me">COM_CONTENT_FILTER_AUTHORS_BY_ME</option>
5151
</field>
5252

administrator/components/com_content/tmpl/featured/default.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,12 @@
315315
<?php echo $this->escape($item->access_level); ?>
316316
</td>
317317
<td class="small d-none d-md-table-cell">
318-
<?php if ((int) $item->created_by != 0) : ?>
318+
<?php if (!empty($item->author_name)) : ?>
319319
<a href="<?php echo Route::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>">
320320
<?php echo $this->escape($item->author_name); ?>
321321
</a>
322322
<?php else : ?>
323-
<?php echo Text::_('JNONE'); ?>
323+
[ <?php echo Text::_('JNONE'); ?> ]
324324
<?php endif; ?>
325325
<?php if ($item->created_by_alias) : ?>
326326
<div class="smallsub"><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>

administrator/language/en-GB/com_content.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ COM_CONTENT_FIELDS_TYPE_MODAL_ARTICLE="Article"
103103
COM_CONTENT_FIELDSET_PUBLISHING="Publishing"
104104
COM_CONTENT_FIELDSET_RULES="Permissions"
105105
COM_CONTENT_FIELDSET_URLS_AND_IMAGES="Images and Links"
106-
COM_CONTENT_FILTER_AUTHORS_BY_ME="Created by me"
106+
COM_CONTENT_FILTER_AUTHORS_BY_ME="- Created by me -"
107107
COM_CONTENT_FILTER_FEATURED_NO="Unfeatured Articles"
108108
COM_CONTENT_FILTER_FEATURED_YES="Featured Articles"
109109
COM_CONTENT_FILTER_SEARCH_DESC="Search in title, alias and note. Prefix with ID: or AUTHOR: or CONTENT: to search for an article ID, article author or search in article content. Prefix with CHECKEDOUT: to search for content checked out by a specified user."

administrator/language/en-GB/joomla.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ JNEXT="Next"
103103
JNEXT_TITLE="Next article: %s"
104104
JNO="No"
105105
JNONE="None"
106+
JNONE_FILTER="- None -"
106107
JOFF="Off"
107108
JOK="OK"
108109
JON="On"

api/language/en-GB/joomla.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ JNEXT="Next"
101101
JNEXT_TITLE="Next article: %s"
102102
JNO="No"
103103
JNONE="None"
104+
JNONE_FILTER="- None -"
104105
JOFF="Off"
105106
JOK="OK"
106107
JON="On"

components/com_content/forms/filter_articles.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
hint="JOPTION_SELECT_AUTHOR"
5151
onchange="this.form.submit();"
5252
>
53-
<option value="0">JNONE</option>
53+
<option value="0">JNONE_FILTER</option>
54+
<option value="by_me">COM_CONTENT_FILTER_AUTHORS_BY_ME</option>
5455
</field>
5556

5657
<field

language/en-GB/com_content.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ COM_CONTENT_FIELD_URLB_LABEL="Link B"
4747
COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL="Link B Text"
4848
COM_CONTENT_FIELD_URLC_LABEL="Link C"
4949
COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL="Link C Text"
50+
COM_CONTENT_FILTER_AUTHORS_BY_ME="- Created by me -"
5051
COM_CONTENT_FILTER_SEARCH_DESC="Content Filter Search"
5152
COM_CONTENT_FLOAT_LABEL="Image Float"
5253
COM_CONTENT_FORM_EDIT_ARTICLE="Edit an article"

0 commit comments

Comments
 (0)