Merge pull request #560 from c2corg/association-editor-modif-outing

Association editor - Modification of outing's link
c2corg · Apr 16, 2019 · 6b5520a · 6b5520a
2 parents fc8af82 + b50392c
commit 6b5520a
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/...cument/utils/windows/AssociationItems.vue → ...s/association-editor/AssociationItems.vue b/...cument/utils/windows/AssociationItems.vue → ...s/association-editor/AssociationItems.vue
@@ -19,6 +19,8 @@
 
         <pretty-book-link v-else-if="childType==='book'" :book="child.document" />
 
+        <association-outing-link v-else-if="childType==='outing'" :outing="child.document" />
+
         <pretty-route-link
           v-else-if="childType==='route'"
           :route="child.document"
@@ -55,8 +57,11 @@
 
 <script>
   import c2c from '@/js/apis/c2c';
+  import AssociationOutingLink from './AssociationOutingLink';
 
   export default {
+    components: { AssociationOutingLink },
+
     props: {
 
       parent: {

diff --git a/src/components/association-editor/AssociationOutingLink.vue b/src/components/association-editor/AssociationOutingLink.vue
@@ -0,0 +1,27 @@
+<template>
+  <document-link :document="outing" class="pretty-outing-link has-hover-background">
+    <span class="has-text-normal">
+      {{ outing.date_start }}&hairsp;&bull;&hairsp;{{ outing.author.name }} -
+    </span>
+    <document-title :document="outing" />
+  </document-link>
+</template>
+
+<script>
+  export default {
+    props: {
+      outing: {
+        type: Object,
+        required: true
+      }
+    }
+  };
+</script>
+
+<style scoped lang="scss">
+
+    .pretty-outing-link{
+        display:block
+    }
+
+</style>
diff --git a/...ment/utils/windows/AssociationsWindow.vue → ...association-editor/AssociationsWindow.vue b/...ment/utils/windows/AssociationsWindow.vue → ...association-editor/AssociationsWindow.vue
diff --git a/src/views/document/utils/boxes/ToolBox.vue b/src/views/document/utils/boxes/ToolBox.vue
@@ -122,7 +122,7 @@
   import LicenseBox from './LicenseBox';
   import AssociatedDocuments from './AssociatedDocuments';
 
-  import AssociationsWindow from '../windows/AssociationsWindow';
+  import AssociationsWindow from '@/components/association-editor/AssociationsWindow';
   import DeleteDocumentWindow from '../windows/DeleteDocumentWindow';
   import DeleteLocaleWindow from '../windows/DeleteLocaleWindow';
   import MergeDocumentWindow from '../windows/MergeDocumentWindow';