de-duplicate project namespace markup

5c36905a · Mike Greiling · 16e6431c · 5c36905a · 5c36905a
Commit 5c36905a authored Oct 12, 2016 by Mike Greiling
Showing with 8 additions and 12 deletions

app/views/notify/pipeline_failed_email.html.haml app/views/notify/pipeline_failed_email.html.haml +4 -6

app/views/notify/pipeline_success_email.html.haml app/views/notify/pipeline_success_email.html.haml +4 -6

No files found.
--- a/app/views/notify/pipeline_failed_email.html.haml
+++ b/app/views/notify/pipeline_failed_email.html.haml
@@ -76,12 +76,10 @@
                                %tr
                                  %td{style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;"} Project
                                  %td{style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;"}
-                                    - if @project.group
+                                    - namespace_name = @project.group ? @project.group.name : @project.namespace.owner.name
-                                      %a.muted{href: group_url(@project.group), style: "color:#333333;text-decoration:none;"}
+                                    - namespace_url = @project.group ? group_url(@project.group) : user_url(@project.namespace.owner)
-                                        = @project.group.name
+                                    %a.muted{href: namespace_url, style: "color:#333333;text-decoration:none;"}
-                                    - else
+                                      = namespace_name
-                                      %a.muted{href: user_url(@project.namespace.owner), style: "color:#333333;text-decoration:none;"}
-                                        = @project.namespace.owner.name
                                    \/
                                    %a.muted{href: project_url(@project), style: "color:#333333;text-decoration:none;"}
                                      = @project.name

--- a/app/views/notify/pipeline_success_email.html.haml
+++ b/app/views/notify/pipeline_success_email.html.haml
@@ -76,12 +76,10 @@
                                %tr
                                  %td{style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;"} Project
                                  %td{style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;"}
-                                    - if @project.group
+                                    - namespace_name = @project.group ? @project.group.name : @project.namespace.owner.name
-                                      %a.muted{href: group_url(@project.group), style: "color:#333333;text-decoration:none;"}
+                                    - namespace_url = @project.group ? group_url(@project.group) : user_url(@project.namespace.owner)
-                                        = @project.group.name
+                                    %a.muted{href: namespace_url, style: "color:#333333;text-decoration:none;"}
-                                    - else
+                                      = namespace_name
-                                      %a.muted{href: user_url(@project.namespace.owner), style: "color:#333333;text-decoration:none;"}
-                                        = @project.namespace.owner.name
                                    \/
                                    %a.muted{href: project_url(@project), style: "color:#333333;text-decoration:none;"}
                                      = @project.name