Merge pull request #1174 from AgID/develop

Consolidation in master
AgID · Oct 30, 2021 · 4714a02 · 4714a02
2 parents a983e28 + ba0ecd3
commit 4714a02
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/app/Http/Controllers/WidgetsController.php b/app/Http/Controllers/WidgetsController.php
@@ -7,6 +7,7 @@
 use App\Models\PublicAdministration;
 use App\Models\Website;
 use App\Traits\HasRoleAwareUrls;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\View\View;
 use Symfony\Component\Yaml\Yaml;
 
@@ -28,22 +29,23 @@ public function __construct()
      * @param Website $website The website
      * @param PublicAdministration $publicAdministration The PublicAdministration
      *
-     * @return View The view
+     * @return View|RedirectResponse The view or a redirect response
      */
-    public function index(Website $website, PublicAdministration $publicAdministration): View
+    public function index(Website $website, PublicAdministration $publicAdministration)
     {
         $publicAdministration = auth()->user()->can(UserPermission::ACCESS_ADMIN_AREA)
             ? $publicAdministration
             : current_public_administration();
 
         if ($website->status->is(WebsiteStatus::PENDING)) {
             $redirectUrl = $this->getRoleAwareUrl('websites.show', ['website' => $website], $publicAdministration);
-            $name = $website->name;
 
             return redirect()->to($redirectUrl)->withNotification([
-                'title' => __('Errore'),
-                'message' => __("Attiva il sito '$name' prima di accedere all'anteprima dei widget."),
-                'status' => 'error',
+                'title' => __('sito non attivo'),
+                'message' => __("Attiva il sito <b>:site</b> prima di accedere all'anteprima dei widget.", [
+                    'site' => $website->name,
+                ]),
+                'status' => 'warning',
                 'icon' => 'it-close-circle',
             ]);
         }

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "italia/wai-portal",
     "description": "Web Analytics Italia",
-    "version": "2.1.3-beta",
+    "version": "2.1.4-beta",
     "keywords": ["analytics", "italia"],
     "license": "AGPL-3.0-or-later",
     "type": "project",

diff --git a/resources/views/pages/widgets-preview.blade.php b/resources/views/pages/widgets-preview.blade.php
@@ -41,9 +41,11 @@
                                         ]) !!}
                                     @endif
                                     <br><br>
-                                    {!! __("È possibile modificare i parametri in URL secondo le proprie esigenze,
+                                    {{ __("I dati visualizzati si riferiscono al mese precedente.") }}
+                                    <br><br>
+                                    {{ __("È possibile modificare i parametri in URL secondo le proprie esigenze,
                                         tuttavia si consiglia di mantentere l'impostazione predefinita per garantire
-                                        la disponibilità dei dati.") !!}
+                                        la disponibilità dei dati.") }}
                                 </div>
                             </div>
                         </div>