Attach file button label consistency

[Thijs Triemstra]

On a ticket page the label for the file attach button always reads 'Attach file'. On the attachments page that label always reads 'Attach another file'.

The issue with the 'Attach another file' label is the fact it's always showing, even when there are no attachments, although the label suggests a file was previously attached. A solution would be using the label 'Attach file' when there are 0 attachments, and 'Attach another file' when there are one or more attachments already.

This could also apply to the label on the ticket page.

[Remy Blank]

PatchWelcome.

[Ryan J Ollos <ryan.j.ollos@…>]

I've implemented this behavior in ​0e037825, such that every add attachment button reads Attach file in the case of no existing attachments, and Attach another file in the case of existing attachments. The implementation includes functional tests, extends test coverage to exercise milestone attachments and splits out part of TestTickets and TestWiki test cases, as recommended in the Todo.

In ​7853b262, some refactoring of the tester class was done. In ​63dd4df7, the submitted value was renamed to remove the now unnecessary whitespace.

My first attempt at the implementation can be seen in ​4e11ff91, but I think the second attempt, described above, is better.

[Ryan J Ollos]

Proposed changes can be found in log:rjollos.git:t10251. I may retarget this to 1.0.2 if the changes are ready to be committed in time for the release.

[Ryan J Ollos]

Committed to 1.0-stable in [12414] and merged to trunk in [12415] (and added a fix for a failing test case on the trunk).

[Jun Omae]

The changes in attach_file_form.html would be simple like this.

trac/templates/attach_file_form.html

@@ -12 +12 @@
       py:if="alist.can_create" method="get" action="${alist.attach_href}" id="attachfile">
   <div>
     <input type="hidden" name="action" value="new" />
-    <input type="submit" id="attachfilebutton" value="${value_of('add_button_title') or (len(alist.attachments) and _('Attach another file')) or _('Attach file')}" />
+    <input type="submit" id="attachfilebutton"
+           value="${value_of('add_button_title') or
+                    (_('Attach another file') if alist.attachments else _('Attach file'))}" />
   </div>
 </form>

[Ryan J Ollos]

Okay, I will commit your refactoring.

[Ryan J Ollos]

Committed to 1.0-stable in [12419]; merged to trunk in [12420].