diff --git a/composer.json b/composer.json index 69694f3ed..3e93f74c6 100755 --- a/composer.json +++ b/composer.json @@ -113,7 +113,6 @@ "Modules\\Partitario\\": ["modules/partitario/custom/src/", "modules/partitario/src/"], "Modules\\StatoEmail\\": ["modules/stato_email/custom/src/", "modules/stato_email/src/"], "Modules\\FileAdapters\\": ["modules/adattatori_archiviazione/custom/src/", "modules/adattatori_archiviazione/src/"], - "Modules\\ModuleFields\\": ["modules/viste/custom/src/", "modules/viste/src/"], "Plugins\\ExportFE\\": ["plugins/exportFE/custom/src/", "plugins/exportFE/src/"], "Plugins\\ImportFE\\": ["plugins/importFE/custom/src/", "plugins/importFE/src/"], "Plugins\\ReceiptFE\\": ["plugins/receiptFE/custom/src/", "plugins/receiptFE/src/"], diff --git a/modules/viste/actions.php b/modules/viste/actions.php index 908c97d9c..2594a4634 100755 --- a/modules/viste/actions.php +++ b/modules/viste/actions.php @@ -21,7 +21,7 @@ include_once __DIR__.'/../../core.php'; use Models\Clause; use Models\Module; -use Modules\ModuleFields\ModuleField; +use Models\View; switch (filter('op')) { case 'update': @@ -76,7 +76,7 @@ switch (filter('op')) { } // Aggiornamento traduzione nome campo - $vista = ModuleField::find($id); + $vista = View::find($id); $vista->setTranslation('name', $name); // Aggiornamento dei permessi relativi @@ -156,7 +156,11 @@ switch (filter('op')) { case 'test': $module_query = Util\Query::getQuery(Module::find($id_record)); - $dbo->fetchArray($module_query.' LIMIT 1'); + try{ + $dbo->fetchArray($module_query.' LIMIT 1'); + } catch (PDOException $e) { + flash()->error(tr('Impossibile eseguire la query!')); + } break; diff --git a/modules/viste/fields.php b/modules/viste/fields.php index 3968ae7fa..477e63350 100755 --- a/modules/viste/fields.php +++ b/modules/viste/fields.php @@ -39,8 +39,7 @@ foreach ($fields as $key => $field) {

'. - $field->getTranslation('name').' '.(new \Carbon\Carbon($field->created_at))->diffForHumans().' - + $field->getTranslation('name').' '.(new \Carbon\Carbon($field->updated_at))->diffForHumans().'

diff --git a/modules/viste/src/ModuleField.php b/modules/viste/src/ModuleField.php deleted file mode 100644 index df4259038..000000000 --- a/modules/viste/src/ModuleField.php +++ /dev/null @@ -1,52 +0,0 @@ -. - */ - -namespace Modules\ModuleFields; - -use Models\Module; -use Common\SimpleModelTrait; -use Traits\RecordTrait; -use Illuminate\Database\Eloquent\Model; - -class ModuleField extends Model -{ - use SimpleModelTrait; - use RecordTrait; - - protected $table = 'zz_views'; - - /** - * The attributes that aren't mass assignable. - * - * @var array - */ - protected $guarded = []; - - protected $translatable = ['name']; - - public function getModuleAttribute() - { - return 'Viste'; - } - - public function module() - { - return $this->belongsTo(Module::class, 'id_module'); - } -}