Fixed some issues

eea · Apr 20, 2021 · 4620ee6 · 4620ee6
1 parent 23e3f30
commit 4620ee6
Show file tree

Hide file tree

Showing 10 changed files with 4,976 additions and 604 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -10,9 +10,6 @@
             "volto-embed": [
                 "addons/volto-embed/src"
             ],
-            "volto-tabsview": [
-                "addons/volto-tabsview/src"
-            ],
             "@eeacms/volto-grid-block": [
                 "addons/volto-grid-block/src"
             ]

diff --git a/mrs.developer.json b/mrs.developer.json
@@ -1,7 +1,7 @@
 {
   "volto-addons": {
     "url": "https://github.com/eea/volto-addons.git",
-    "branch": "volto_7",
+    "branch": "master",
     "path": "src",
     "develop": true
   },
@@ -23,12 +23,6 @@
     "path": "src",
     "package": "@eeacms/volto-grid-block",
     "develop": true
-  },
-  "volto-tabsview": {
-    "url": "https://github.com/eea/volto-tabsview.git",
-    "branch": "master",
-    "path": "src",
-    "develop": true
   }
 }
 
diff --git a/package.json b/package.json
@@ -42,7 +42,8 @@
     "@eeacms/volto-matomo",
     "@eeacms/volto-grid-block",
     "volto-datablocks",
-    "volto-embed"
+    "volto-embed",
+    "volto-addons"
   ],
   "dependencies": {
     "@eeacms/volto-slate-metadata-mentions": "github:eea/volto-slate-metadata-mentions#2.2.0",

diff --git a/src/components/manage/Blocks/ChildrenLinks/View.jsx b/src/components/manage/Blocks/ChildrenLinks/View.jsx
@@ -13,6 +13,7 @@ const getPath = (url) => {
 
 const View = (props) => {
   const childrenLinks = props.data.childrenLinks || null;
+
   return (
     (childrenLinks && childrenLinks.length && (
       <div className="children-links-container">

diff --git a/src/components/manage/Blocks/DetailedLink/View.jsx b/src/components/manage/Blocks/DetailedLink/View.jsx
@@ -34,6 +34,7 @@ const View = (props) => {
     descriptionClassname = '',
     buttonClassname = '',
   } = props.data;
+
   return (
     <div
       className={cx(

diff --git a/src/config.js b/src/config.js
diff --git a/src/customizations/volto/actions/content/content.js b/src/customizations/volto/actions/content/content.js