fixes #7121 - move smart proxy action buttons to helper #1695
Conversation
|
|
||
| if puppetca | ||
| display_link_if_authorized(_("Autosign"), hash_for_smart_proxy_autosign_index_path(:smart_proxy_id => proxy). | ||
| merge(:auth_object => proxy, :permission => 'view_smart_proxies_autosign', :authorizer => authorizer)) |
There was a problem hiding this comment.
why can't this link be added in the above if puppetca?
There was a problem hiding this comment.
It's more or less cut and paste from the existing code :-) It just makes it easier for plug-ins to modify if it's in a helper method, it also makes the template look nicer.
There's a technical reason for the two if's: they will nil if the user isn't authorized, so it would result in for example:
['Certificates', nil] which action_buttons will compact.
It will be more complicated in one if block.
There was a problem hiding this comment.
Actually, I guess it will work in one if, if you want I'll move it, but the goal wasn't to change the code here.
There was a problem hiding this comment.
I wasn't sure if there was a technical reason I was missing.
If it's the same I would prefer it was in one if for clarity
|
@orrabin Fixed, uses 1 if statement. |
| @@ -0,0 +1,19 @@ | |||
| module SmartProxiesHelper | |||
| def proxy_actions proxy, authorizer | |||
| [if proxy.features.detect{ |feature| feature.name == "Puppet CA" } | |||
There was a problem hiding this comment.
indentation's two spaces too deep in this method
stbenjam
force-pushed
the
7121
branch
3 times, most recently
from
781c458
to
9260604
Compare
|
@domcleal Fixed the indentation. Are you all planning for rubocop in Foreman? I also reduced the number of problems except for line lengths, methods like |
|
I wasn't worried about the rest of the style really, it was just the indentation. Unfortunately your changes have broken the syntax on 1.8. |
stbenjam
force-pushed
the
7121
branch
3 times, most recently
from
739c1cb
to
0c5c66c
Compare
|
Sorry, fixed. |
No description provided.