Merge branch 'develop' into setup-semgrep-php-sast-job

luistoptal · Nov 12, 2024 · 2d23770 · 2d23770
2 parents dfc5ffa + 1deb11f
commit 2d23770
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Unreleased
 
 - Feat #1867: Update the gitlab static application security testing (SAST) job using the Semgrep-based analyzer
+- Fix #2066: Max length for attribute value set to 1000 in file admin form
 - Feat #1968: Add curators manual for operating tools on bastion server
 - Feat #1750: Switch to guzzle instead of cURL
 - Fix #2042: Batch deletion of file attributes and samples

diff --git a/protected/models/FileAttributes.php b/protected/models/FileAttributes.php
@@ -46,7 +46,7 @@ public function rules()
         return array(
             array('file_id, attribute_id', 'required'),
             array('file_id, attribute_id', 'numerical', 'integerOnly' => true),
-            array('value', 'length', 'max' => 50),
+            array('value', 'length', 'max' => 1000),
             array('unit_id', 'length', 'max' => 30),
             // The following rule is used by search().
             // Please remove those attributes that should not be searched.

diff --git a/protected/views/adminFile/_form.php b/protected/views/adminFile/_form.php
@@ -187,7 +187,8 @@
                                 'class' => 'mb-10'
                             ],
                             'inputOptions' => [
-                                'class' => 'attr-form'
+                                'class' => 'attr-form',
+                                'maxlength' => 1000
                             ],
                             'tooltip' => 'The value of the chosen attribute for this file'
                         ]);
@@ -316,4 +317,4 @@ function toggleNewAttrForm() {
         }, 200);
     })
   })
-</script>
+</script>
diff --git a/tests/acceptance/AdminFileAttributes.feature b/tests/acceptance/AdminFileAttributes.feature
@@ -158,4 +158,18 @@ Feature: A curator can manage file attributes in admin file update page
     Then I should see a file attribute table
       | Attribute Name | Value     | Unit |
       | last_modified  | 2013-7-15 |      |
-      | age            | 35        |      |
+      | age            | 35        |      |
+
+  @ok @issue-2066
+  Scenario: Works for the new attribute's length value up to 1000
+    Given I have signed in as admin
+    And I am on "/adminFile/update/id/13973"
+    And I press the button "Edit"
+    And I press the button "Show New Attribute Fields"
+    When I select "comment" in menu "FileAttributes_new_attribute_id"
+    And I fill in the text input "FileAttributes[new][value]" with "embryophyta_odb10 C:99.1%[S:77.9%,D:21.2%],F:0.4%,M:0.5%,n:1614"
+    And I press the button "Add attribute"
+    Then I should see a file attribute table
+      | Attribute Name | Value     | Unit |
+      | last_modified  | 2013-7-15 |      |
+      | comment            | embryophyta_odb10 C:99.1%[S:77.9%,D:21.2%],F:0.4%,M:0.5%,n:1614        |      |