Handle Ordering of Templates When "No research organization" Box is Checked

[aaronskiba]

Fixes #685

• Portage Template not default/first template #685

Changes proposed in this PR:

• Fix Ordering of Templates Within Create Plan Template Dropdown #706 partly addressed Portage Template not default/first template #685. However, it did not account for when the "No research organization associated with this plan or my research organization is not listed" box is checked. This PR handles that extra case.

[aaronskiba]

I would've called @templates = @templates.flatten.uniq at the end of the else block. But because it already exists in the if block as well, I just moved it outside of the blocks to avoid redundancy (and the rubocop offense).

I also changed @templates = @templates.flatten.uniq to @templates = @templates.flatten. @templates = @templates.uniq gets called at the end of the controller action, so calling .uniq again on line 57 would have been redundant.

[200455939-yashu]

Good work 🥳