Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
5 changes: 4 additions & 1 deletion locales/default.pot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: BEdita 4 \n"
"POT-Creation-Date: 2024-11-22 13:38:50 \n"
"POT-Creation-Date: 2024-12-02 16:33:07 \n"
"MIME-Version: 1.0 \n"
"Content-Transfer-Encoding: 8bit \n"
"Language-Team: BEdita I18N & I10N Team \n"
Expand Down Expand Up @@ -796,6 +796,9 @@ msgstr ""
msgid "Select a project"
msgstr ""

msgid "Show active positions"
msgstr ""

msgid "Sign in"
msgstr ""

Expand Down
5 changes: 4 additions & 1 deletion locales/en_US/default.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: BEdita Manager \n"
"POT-Creation-Date: 2024-11-22 13:38:50 \n"
"POT-Creation-Date: 2024-12-02 16:33:07 \n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: BEdita I18N & I10N Team \n"
Expand Down Expand Up @@ -799,6 +799,9 @@ msgstr ""
msgid "Select a project"
msgstr ""

msgid "Show active positions"
msgstr ""

msgid "Sign in"
msgstr ""

Expand Down
5 changes: 4 additions & 1 deletion locales/it_IT/default.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: BEdita Manager \n"
"POT-Creation-Date: 2024-11-22 13:38:50 \n"
"POT-Creation-Date: 2024-12-02 16:33:07 \n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: BEdita I18N & I10N Team \n"
Expand Down Expand Up @@ -804,6 +804,9 @@ msgstr "Cerca"
msgid "Select a project"
msgstr "Seleziona un progetto"

msgid "Show active positions"
msgstr "Mostra posizione attive"

msgid "Sign in"
msgstr "Accedi"

Expand Down
6 changes: 6 additions & 0 deletions resources/js/app/components/property-view/property-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export default {
userInfoLoaded: false,
fileChanged: false,
searchInPosition: '',
searchInPositionActive: false,
}
},

Expand Down Expand Up @@ -125,6 +126,7 @@ export default {
toggleVisibility() {
this.isOpen = !this.isOpen;
this.searchInPosition = '';
this.searchInPositionActive = !this.searchInPositionActive;
this.checkLoadRelated();
this.updateStorage();
},
Expand Down Expand Up @@ -249,5 +251,9 @@ export default {

return debouncedSearchPosition(e.target.value);
},

onSearchInPositionActive(e) {
this.searchInPositionActive = e.target.checked ? true : false;
},
}
}
11 changes: 10 additions & 1 deletion resources/js/app/components/tree-view/tree-view.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
:user-roles="userRoles"
:has-permissions="hasPermissions"
:show-forbidden="showForbidden"
:search="search">
:search="search"
:search-in-position-active="searchInPositionActive">
</tree-view>
</div>
</div>
Expand Down Expand Up @@ -171,6 +172,10 @@
type: String,
default: '',
},
searchInPositionActive: {
type: Boolean,
default: false,
},
},
data() {
Expand Down Expand Up @@ -329,6 +334,10 @@
return false;
}
if (this.searchInPositionActive && !this.isParent && !!!this.node.children) {

Check failure on line 337 in resources/js/app/components/tree-view/tree-view.vue

View workflow job for this annotation

GitHub Actions / Check javascript build (22.x)

Redundant double negation

Check failure on line 337 in resources/js/app/components/tree-view/tree-view.vue

View workflow job for this annotation

GitHub Actions / Check javascript build (16.x)

Redundant double negation

Check failure on line 337 in resources/js/app/components/tree-view/tree-view.vue

View workflow job for this annotation

GitHub Actions / Check javascript build (18.x)

Redundant double negation

Check failure on line 337 in resources/js/app/components/tree-view/tree-view.vue

View workflow job for this annotation

GitHub Actions / Check javascript build (20.x)

Redundant double negation

Check failure on line 337 in resources/js/app/components/tree-view/tree-view.vue

View workflow job for this annotation

GitHub Actions / Check javascript build (22.x)

Redundant double negation

Check failure on line 337 in resources/js/app/components/tree-view/tree-view.vue

View workflow job for this annotation

GitHub Actions / Check javascript build (18.x)

Redundant double negation
return false;
}
if (!this.hasPermissions) {
return true;
}
Expand Down
10 changes: 9 additions & 1 deletion templates/Element/Form/trees.twig
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
</button>
</div>

<div class="mt-1">
<label>
<input type="checkbox" @input="onSearchInPositionActive" />
{{ __('Show active positions') }}
</label>
</div>

<p v-if="searchInPosition.length" class="is-expanded tag mt-1">
<app-icon icon="carbon:filter"></app-icon>
<span class="ml-05">{{ __('Data is filtered') }}</span>
Expand All @@ -46,7 +53,8 @@
:multiple-choice={{ options.multiple }}
:user-roles="{{ user.roles|json_encode }}"
:has-permissions="{{ hasPermissions|json_encode }}"
:search="searchInPosition">
:search="searchInPosition"
:search-in-position-active="searchInPositionActive">
</tree-view>
</div>
{% do Form.unlockField('relations.' ~ relationName ~ '.replaceRelated') %}
Expand Down
Loading