Skip to content

Commit

Permalink
Do not use instance variables in partials
Browse files Browse the repository at this point in the history
My objection is noted in PR #6472
  • Loading branch information
hennevogel committed Dec 6, 2018
1 parent 0e3b6cd commit 51030dd
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 44 deletions.
48 changes: 24 additions & 24 deletions src/api/app/views/webui2/webui/projects/pulse/_pulse_list.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,89 +2,89 @@
.col
%p
During this period
= render partial: 'pulse_list_commits'
= render partial: 'pulse_list_commits', locals: { commits: commits, updates: updates }
%p
= render partial: 'pulse_list_builds'
= render partial: 'pulse_list_new'
= render partial: 'pulse_list_changes'
= render partial: 'pulse_list_builds', locals: { builds: builds }
= render partial: 'pulse_list_new', locals: { new_packages: new_packages, deleted_packages: deleted_packages }
= render partial: 'pulse_list_changes', locals: { project_changes: project_changes }
%p
= render partial: 'pulse_list_branches'
= render partial: 'pulse_list_comments'
= render partial: 'pulse_list_branches', locals: { branches: branches }
= render partial: 'pulse_list_comments', locals: { comments: comments }

.col
.card
.card-header
Requests
.card-body
- if @requests.any?
- if requests.any?
.row
.col
.progress
-# haml-lint:disable InlineStyles
- @requests_by_percentage.each do |state, percentage|
%div{ title: "#{@requests_by_state[state]} #{state} requests",
- requests_by_percentage.each do |state, percentage|
%div{ title: "#{requests_by_state[state]} #{state} requests",
class: "progress-bar progress-state-#{state}",
'aria-valuemax': '100', 'aria-valuemin': '0', 'aria-valuenow': percentage,
role: 'progressbar', style: "width: #{percentage}%" }
-# haml-lint:enable InlineStyles
%p
= link_to('#pulse-requests') do
= @requests_by_state.values.sum
= requests_by_state.values.sum
active requests
.row
- @requests_by_state.each_key do |state|
- requests_by_state.each_key do |state|
.col.border.text-center
%p.fa-3x
%i{ class: "fa #{request_bootstrap_icon(state)} request-state-#{state}" }
%p
= pluralize(@requests_by_state[state], 'request')
= pluralize(requests_by_state[state], 'request')
%br
in #{state}
- else
= link_to(project_requests_path(@project)) do
= link_to(project_requests_path(project)) do
There have been no requests send to this project.
.row
.col
%h5#pulse-packages
Package Changes
%hr
%ul.list-unstyled
- (@commits + @new_packages + @deleted_packages + @updates).sort_by(&:datetime).reverse_each do |log_entry|
- (commits + new_packages + deleted_packages + updates).sort_by(&:datetime).reverse_each do |log_entry|
%li
= render partial: 'pulse_list_entry', locals: { log_entry: log_entry }
= render partial: 'pulse_list_entry', locals: { log_entry: log_entry, project: project }

%h5#pulse-project
Project Changes
%hr
%ul.list-unstyled
- @project_changes.each do |log_entry|
- project_changes.each do |log_entry|
%li
= render partial: 'pulse_list_entry', locals: { log_entry: log_entry }
= render partial: 'pulse_list_entry', locals: { log_entry: log_entry, project: project }

%h5#pulse-builds
Builds
%hr
%ul.list-unstyled
- @builds.each do |log_entry|
- builds.each do |log_entry|
%li
= render partial: 'pulse_list_entry', locals: { log_entry: log_entry }
= render partial: 'pulse_list_entry', locals: { log_entry: log_entry, project: project }

%h5#pulse-collaboration
Collaboration
%hr
%ul.list-unstyled
- (@branches + @comments).sort_by(&:datetime).reverse_each.each do |log_entry|
- (branches + comments).sort_by(&:datetime).reverse_each.each do |log_entry|
%li
= render partial: 'pulse_list_entry', locals: { log_entry: log_entry }
= render partial: 'pulse_list_entry', locals: { log_entry: log_entry, project: project }

%h5#pulse-requests
Requests
- if @requests.count > 30
- if requests.count > 30
%small.text-muted
( last 30,
= link_to(project_requests_path(@project)) do
= link_to(project_requests_path(project)) do
view all
)
%hr
= render partial: 'pulse_list_requests', locals: { requests: @requests }
= render partial: 'pulse_list_requests', locals: { requests: requests }

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- if @branches.any?
- if branches.any?
People
= link_to('#pulse-collaboration') do
branched
#{pluralize(@branches.count, 'package')}.
#{pluralize(branches.count, 'package')}.
- else
No one branched packages from this project.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- if @builds.any?
- builds = @builds.group(:event_type).count
- if builds.any?
- builds = builds.group(:event_type).count
There
-# 'has' does not have an inflection and the String
version of pluralize does not know about the plural
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- if @project_changes.any?
- if project_changes.any?
And the project setup has been changed
#{pluralize(@project_changes.count, 'time')}.
#{pluralize(project_changes.count, 'time')}.
- else
And no one touched the project setup.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
- if @comments.any?
- if comments.any?
And
- people = @comments.group(:user_name).count
- people = comments.group(:user_name).count
= pluralize(people.count, 'person')
added
= link_to('#pulse-collaboration') do
= pluralize(@comments.count, 'comment')
= pluralize(comments.count, 'comment')
in here.
- else
And no one commented in here.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- if @commits.any?
- people = @commits.group(:user_name).count
- if commits.any?
- people = commits.group(:user_name).count
%b
= pluralize(people.count, 'person')
added
= link_to('#pulse-packages') do
= pluralize(@commits.count, 'commit')
= pluralize(commits.count, 'commit')
to packages in this project.
- if @updates.any?
- if updates.any?
Out of those commits,
= pluralize(updates.count, 'was a', plural: 'were')
version #{'update'.pluralize(updates.count)}.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= log_entry.event_type.camelcase.prepend('Event::').constantize.description
- if log_entry.package_name
(#{link_to(log_entry.package_name, package_show_path(@project.name, log_entry.package_name))})
(#{link_to(log_entry.package_name, package_show_path(project.name, log_entry.package_name))})
- if log_entry.user_name
by #{link_to(log_entry.user_name, user_show_path(log_entry.user_name))}
= fuzzy_time(log_entry.datetime)
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
There was
- if @new_packages.any?
- if new_packages.any?
%b.text-success
= @new_packages.count
= 'package'.pluralize(@new_packages.count)
= new_packages.count
= 'package'.pluralize(new_packages.count)
created
- else
no package created
- if @deleted_packages.any?
- if deleted_packages.any?
and
%b.text-danger
= @deleted_packages.count
= deleted_packages.count
deleted.
- else
\.
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
$('#range-header').html("<%= escape_javascript(pulse_period(@range)) %>");
$('#range-text').html("<%= @range.titleize %>");
$('#pulse').html("<%= escape_javascript render partial: 'pulse_list' %>");
$('#pulse').html("<%= escape_javascript render partial: 'pulse_list', locals: { requests_by_percentage: @requests_by_percentage,
requests_by_state: @requests_by_state,
project: @project,
commits: @commits,
new_packages: @new_packages,
deleted_packages: @deleted_packages,
updates: @updates,
project_changes: @project_changes,
builds: @builds,
branches: @branches,
comments: @comments,
requests: @requests } %>");

0 comments on commit 51030dd

Please sign in to comment.