Merge pull request #2 from caprowsky/sardegnait

Sardegnait
caprowsky · Oct 2, 2017 · d433273 · d433273
2 parents a5b11b5 + 9445bf4
commit d433273
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/modules/custom/bandi/src/Controller/PdfController.php b/modules/custom/bandi/src/Controller/PdfController.php
@@ -39,7 +39,7 @@ public function view(EntityInterface $node, $view_mode = 'pdf', $langcode = NULL
     $mpdf->SetHTMLFooter('<div class="footer">www.sardegnaimpresa.eu</div>');
 
     $mpdf->WriteHTML($output);
-    $content = $mpdf->Output($this->title($node), Destination::INLINE);
+    $content = $mpdf->Output($this->title($node) . '.pdf', Destination::DOWNLOAD);
 
     $headers = [
       'Content-Type: application/pdf',

diff --git a/sites/default/config/user.role.capo_redattore.yml b/sites/default/config/user.role.capo_redattore.yml
@@ -27,6 +27,7 @@ permissions:
   - 'create url aliases'
   - 'create video content'
   - 'delete all revisions'
+  - 'delete any faq content'
   - 'delete any news content'
   - 'delete any page content'
   - 'delete any procedimento content'
@@ -37,6 +38,7 @@ permissions:
   - 'delete faq revisions'
   - 'delete glossary revisions'
   - 'delete news revisions'
+  - 'delete own faq content'
   - 'delete own page content'
   - 'delete page revisions'
   - 'delete procedimento revisions'
@@ -54,6 +56,7 @@ permissions:
   - 'edit own procedimento content'
   - 'override bando revision log entry'
   - 'override custom_content revision log entry'
+  - 'override faq published option'
   - 'override faq revision log entry'
   - 'override glossary revision log entry'
   - 'override homepage revision log entry'

diff --git a/sites/default/config/user.role.redattore.yml b/sites/default/config/user.role.redattore.yml
@@ -28,7 +28,9 @@ permissions:
   - 'create page content'
   - 'create procedimento content'
   - 'create video content'
+  - 'delete any faq content'
   - 'delete any page content'
+  - 'delete own faq content'
   - 'edit any bando content'
   - 'edit any custom_content content'
   - 'edit any faq content'
@@ -44,6 +46,7 @@ permissions:
   - 'edit own procedimento content'
   - 'override bando revision log entry'
   - 'override custom_content revision log entry'
+  - 'override faq published option'
   - 'override faq revision log entry'
   - 'override glossary revision log entry'
   - 'override homepage revision log entry'

diff --git a/themes/si8/js/si8-menu.js b/themes/si8/js/si8-menu.js
@@ -86,7 +86,7 @@ if (jQuery('#block-navigazioneprincipale>ul>li.expanded').length > 0) {
 
 if (jQuery('aside #block-elencoargomenti').length > 0 ||
     jQuery('aside #block-inevidenza-menu').length > 0 ||
-    jQuery('section.block-facets').length > 0
+    jQuery('aside section.block-facets').length > 0
 ) {
   jQuery(document).ready(function (){
     jQuery('#secondary-menu-btn').removeClass('invisibile');