diff --git a/app/views/home/partials/_issue_assign_notification.haml b/app/views/home/partials/_issue_assign_notification.haml index 5dd7a9944..2dce880d9 100644 --- a/app/views/home/partials/_issue_assign_notification.haml +++ b/app/views/home/partials/_issue_assign_notification.haml @@ -1,8 +1,8 @@ .top .text %span - = raw t("notifications.bodies.issue_assign_notification", { issue_link: link_to(issue_title, project_issue_path(project_owner, project_name, issue_serial_id))}) - name_with_owner = "#{project_owner}/#{project_name}" + = raw t("notifications.bodies.issue_assign_notification", { issue_link: link_to(issue_title, project_issue_path(name_with_owner, issue_serial_id))}) = raw t("notifications.bodies.project", project_link: link_to(name_with_owner, project_path(name_with_owner)) ) .both = datetime_moment activity_feed.created_at, tag: :span, class: 'date' diff --git a/app/views/projects/projects/_form.html.haml b/app/views/projects/projects/_form.html.haml index 0b623ef9b..73c43ab17 100644 --- a/app/views/projects/projects/_form.html.haml +++ b/app/views/projects/projects/_form.html.haml @@ -52,7 +52,7 @@ -# TODO: Maybe use something like Chosen with filter and prepopulated -# list of potential maintainers? = autocomplete_field_tag :maintainer_name, @project.maintainer.fullname, - autocomplete_maintainers_path(@project.owner, @project), + autocomplete_maintainers_path(@project), id_element: '#project_maintainer_id', placeholder: @project.maintainer.fullname diff --git a/app/views/projects/projects/index.json.jbuilder b/app/views/projects/projects/index.json.jbuilder index f2cc8c559..f277c3de7 100644 --- a/app/views/projects/projects/index.json.jbuilder +++ b/app/views/projects/projects/index.json.jbuilder @@ -2,20 +2,20 @@ json.sEcho h(params[:sEcho].to_i || -1) json.iTotalRecords @projects[:total_count] json.iTotalDisplayRecords @projects[:filtered_count] -json.messages do |msg| - msg.remove_confirm t("layout.confirm") +json.messages do + json.remove_confirm t("layout.confirm") end -json.icons do |icons| - icons.visibilities do |vis| +json.icons do + json.visibilities do Project::VISIBILITIES.each do |visibility| - vis.set!(visibility, image_path(visibility_icon(visibility))) + json.set!(visibility, image_path(visibility_icon(visibility))) end end end -json.aaData do |aadata| - aadata.array!(@projects[:projects]) do |json, proj| +json.aaData do + json.array!(@projects[:projects]) do |proj| json.partial! 'project', project: proj end end