fix(admin@0.23): update composer with conflict for charcoal-admin@<0.…

…23.0 and fix the form group widgets id prefixes
locomotivemtl · Mar 2, 2020 · 804cc50 · 804cc50
1 parent 9a70f80
commit 804cc50
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -44,6 +44,9 @@
         "mustache/mustache": "^2.11",
         "locomotivemtl/charcoal-admin": "~0.6"
     },
+    "conflict": {
+        "locomotivemtl/charcoal-admin": "<0.23.0"
+    },
     "autoload": {
         "psr-4": {
             "Charcoal\\": "src/Charcoal"

diff --git a/views/charcoal/admin/template/form/nav-pills.mustache b/views/charcoal/admin/template/form/nav-pills.mustache
@@ -9,13 +9,13 @@
     {{# groups }}
     <li class="nav-item">
         <a class="nav-link{{^ showTitle }} hide-title{{/ showTitle }}{{^ isHidden }} active{{/ isHidden }} js-group-tabs"
-           id="form_group_{{ widgetId }}_tab_{{ ident }}"
-           href="#form_group_{{ widgetId }}"
+           id="{{ widgetId }}_tab_{{ ident }}"
+           href="#{{ widgetId }}"
            role="tab"
            data-toggle="tab"
            data-tab-ident="{{ ident }}"
            data-show-title="{{# showTitle }}true{{/ showTitle }}{{^ showTitle }}false{{/ showTitle }}"
-           aria-controls="form_group_{{ widgetId }}"
+           aria-controls="{{ widgetId }}"
            aria-selected="{{# isHidden }}false{{/ isHidden }}{{^ isHidden }}true{{/ isHidden }}">
             {{# showIcon }}
                 {{# icon }}