From 3e2c33567dbe145f9962ce5e965da75ac78b7359 Mon Sep 17 00:00:00 2001
From: Suzana Dirla <dirla.silvia.suzana@gmail.com>
Date: Thu, 13 Jun 2019 10:09:40 +0300
Subject: [PATCH] [ACA-2420] exclude aspects and order effectivity properties
 (#1124)

* [ACA-2420] exclude aspects and order effectivity properties

* [ACA-2420] ids not needed inside app.config

- this is the 'applied' setting for content-metadata when there
isn't one inside the app.extensions.json that overwrites it
---
 src/app.config.json            | 19 ++++++++++++++++++-
 src/assets/app.extensions.json | 21 ++++++++++++++++++++-
 src/assets/i18n/en.json        |  3 ++-
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/app.config.json b/src/app.config.json
index 3edf0a43a..9b7937934 100644
--- a/src/app.config.json
+++ b/src/app.config.json
@@ -124,9 +124,14 @@
             "cm:content",
             "cm:author",
             "cm:titled",
+            "cm:generalclassifiable",
+            "cm:taggable",
+            "dp:restrictable",
+            "fm:commentsRollup",
             "qshare:shared",
 
-            "exif:exif"
+            "exif:exif",
+            "cm:effectivity"
           ]
         },
         {
@@ -150,6 +155,18 @@
               ]
             }
           ]
+        },
+        {
+          "title": "APP.CONTENT_METADATA.EFFECTIVITY_GROUP_TITLE",
+          "items": [
+            {
+              "aspect": "cm:effectivity",
+              "properties": [
+                "cm:from",
+                "cm:to"
+              ]
+            }
+          ]
         }
       ]
     }
diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json
index 124bb585c..c7f05b0e7 100644
--- a/src/assets/app.extensions.json
+++ b/src/assets/app.extensions.json
@@ -1040,9 +1040,14 @@
               "cm:content",
               "cm:author",
               "cm:titled",
+              "cm:generalclassifiable",
+              "cm:taggable",
+              "dp:restrictable",
+              "fm:commentsRollup",
               "qshare:shared",
 
-              "exif:exif"
+              "exif:exif",
+              "cm:effectivity"
             ]
           },
           {
@@ -1068,6 +1073,20 @@
                 ]
               }
             ]
+          },
+          {
+            "id": "app.content.metadata.effectivityGroup",
+            "title": "APP.CONTENT_METADATA.EFFECTIVITY_GROUP_TITLE",
+            "items": [
+              {
+                "id": "app.content.metadata.effectivityAspect",
+                "aspect": "cm:effectivity",
+                "properties": [
+                  "cm:from",
+                  "cm:to"
+                ]
+              }
+            ]
           }
         ]
       }
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index c68965132..2506ca311 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -335,7 +335,8 @@
             }
         },
         "CONTENT_METADATA": {
-            "EXIF_GROUP_TITLE": "Image EXIF"
+            "EXIF_GROUP_TITLE": "Image EXIF",
+            "EFFECTIVITY_GROUP_TITLE": "Effectivity"
         },
         "INFO_DRAWER": {
             "TITLE": "Details",