Merge branch '4-tags' into 'develop'
feat: ✨ Suggest existing tags in media edition
See merge request ldc-web/projets/dam!14
This commit is contained in:
commit
8941dbacdd
4 changed files with 8 additions and 2 deletions
|
|
@ -84,6 +84,7 @@ class MediaController extends Controller
|
|||
$naturesfichier = ArcadiaNatureFichier::all();
|
||||
$typescontenu = ArcadiaTypeContenu::all();
|
||||
$anglesprisevue = ArcadiaAnglePriseVue::all();
|
||||
$tags = Tag::query()->orderBy('libelle')->get();
|
||||
|
||||
/** @var int|null */
|
||||
$dossier_id = $request->d;
|
||||
|
|
@ -131,6 +132,7 @@ class MediaController extends Controller
|
|||
'naturesfichier' => $naturesfichier,
|
||||
'typescontenu' => $typescontenu,
|
||||
'anglesprisevue' => $anglesprisevue,
|
||||
'tags' => $tags,
|
||||
'langues' => $langues,
|
||||
'copyrights' => $copyrights,
|
||||
'etiquettes' => $etiquettes,
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@
|
|||
:naturesfichier="naturesfichier"
|
||||
:typescontenu="typescontenu"
|
||||
:anglesprisevue="anglesprisevue"
|
||||
:tags="tags"
|
||||
@closeEdit="close"
|
||||
/>
|
||||
<MeLinksComponent :currentTab="currentTab" />
|
||||
|
|
@ -131,6 +132,7 @@ export default {
|
|||
this.naturesfichier = data.naturesfichier;
|
||||
this.typescontenu = data.typescontenu;
|
||||
this.anglesprisevue = data.anglesprisevue;
|
||||
this.tags = data.tags;
|
||||
if (this.open !== undefined) {
|
||||
this.$store.commit({
|
||||
type: "updateMedia",
|
||||
|
|
@ -172,6 +174,7 @@ export default {
|
|||
naturesfichier: [],
|
||||
typescontenu: [],
|
||||
anglesprisevue: [],
|
||||
tags: [],
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
|
|
|
|||
|
|
@ -368,7 +368,7 @@
|
|||
<div class="row">
|
||||
<label>Nuage de tags</label>
|
||||
<v-select
|
||||
:options="[]"
|
||||
:options="tags"
|
||||
label="libelle"
|
||||
:create-option="(item) => ({ id: new Date().getTime(), libelle: item })"
|
||||
v-model="oMedia.tags"
|
||||
|
|
@ -440,7 +440,7 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
|
|||
export default {
|
||||
name: "MeEditComponent",
|
||||
components: { FontAwesomeIcon },
|
||||
props: ["currentTab", "langues", "societes", "marques", "etiquettes", "copyrights", "naturesfichier", "typescontenu", "anglesprisevue"],
|
||||
props: ["currentTab", "langues", "societes", "marques", "etiquettes", "copyrights", "naturesfichier", "typescontenu", "anglesprisevue", "tags"],
|
||||
computed: {
|
||||
storeMedia() {
|
||||
return this.$store.state.media;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
'naturesfichier' => $naturesfichier,
|
||||
'typescontenu' => $typescontenu,
|
||||
'anglesprisevue' => $anglesprisevue,
|
||||
'tags' => $tags,
|
||||
];
|
||||
if(session('autoOpen')) {
|
||||
$dataVue['open'] = session('autoOpen');
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue