Merge branch 'master' of https://github.com/Leantime/leantime

Leantime · Nov 23, 2024 · f09d646 · f09d646
2 parents d5d1c8f + 4e98cbf
commit f09d646
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/app/Core/Db/DbColumn.php b/app/Core/Db/DbColumn.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Leantime\Core\Db;
+
+use Attribute;
+
+#[Attribute]
+class DbColumn
+{
+    public function __construct(
+        public string $name,
+    ) {
+        //
+    }
+}
diff --git a/app/Domain/Connector/Models/Integration.php b/app/Domain/Connector/Models/Integration.php
@@ -2,30 +2,44 @@
 
 namespace Leantime\Domain\Connector\Models {
 
+    use Leantime\Core\Db\DbColumn;
+
     class Integration
     {
+        #[DbColumn('id')]
         public int $id;
 
+        #[DbColumn('providerId')]
         public ?string $providerId;
 
+        #[DbColumn('method')]
         public ?string $method;
 
+        #[DbColumn('entity')]
         public ?string $entity;
 
+        #[DbColumn('fields')]
         public ?string $fields;
 
+        #[DbColumn('schedule')]
         public ?string $schedule;
 
+        #[DbColumn('notes')]
         public ?string $notes;
 
+        #[DbColumn('auth')]
         public ?string $auth;
 
+        #[DbColumn('meta')]
         public ?string $meta;
 
+        #[DbColumn('createdOn')]
         public ?string $createdOn;
 
+        #[DbColumn('createdBy')]
         public ?string $createdBy;
 
+        #[DbColumn('lastSync')]
         public ?string $lastSync;
 
         public function __construct() {}

diff --git a/app/Domain/CsvImport/Templates/upload.tpl.php b/app/Domain/CsvImport/Templates/upload.tpl.php
@@ -6,7 +6,6 @@
     $$var = $val; // necessary for blade refactor
 }
 $maxSize = Fileupload::getMaximumFileUploadSize();
-$moduleId = (int) $_GET['id'] ?? '';
 ?>
 
 <div id="fileManager">