Skip to content

Fixed Issue #2 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixed Issue #2 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c49df5
Removed a +1 for months to get the correct hyperlinks
bachtsui Feb 5, 2016
e91551b
Decided to do Modulous 13, fixed issue #2
bachtsui Feb 5, 2016
1402d8f
Fixed indentation space by one
bachtsui Feb 5, 2016
4fcd8b2
Reverted class names back from dashes to underscore
bachtsui Feb 5, 2016
a216f71
Removed modulous from month = (entry.month.to_i)
bachtsui Feb 5, 2016
4e0ef72
Removed parentheses and trailing white space
bachtsui Feb 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<% sidebar.archives.each do |month| %>
<% counter = sidebar.show_count ? "<em>(#{month[:article_count]})</em>" : "" %>
<li>
<%= link_to"#{month[:name]} #{counter}".html_safe, articles_by_month_path( month[:year], "%02i" % (month[:month]+1) ) %>
<%= link_to"#{month[:name]} #{counter}".html_safe, articles_by_month_path( month[:year], "%02i" % (month[:month]) ) %>
</li>
<% end %>
</ul>
</div>
Copy link
Member

@tgaff tgaff Feb 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like you unindented everything by one space here....

Copy link
Author

@bachtsui bachtsui Feb 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the heads up, spacing should be fixed now.

<% end %>
<% end %>
4 changes: 2 additions & 2 deletions lib/archives_sidebar/lib/archives_sidebar.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ def parse_request(_contents, _params)
article_counts = Content.find_by_sql(["select count(*) as count, #{date_func} from contents where type='Article' and published = ? and published_at < ? group by year,month order by year desc,month desc limit ? ", true, Time.now, count.to_i])

@archives = article_counts.map do |entry|
month = (entry.month.to_i%12)+1
month = entry.month.to_i
year = entry.year.to_i
{
name: I18n.l(Date.new(year, month), format: '%B %Y'),
month: month - 1,
month: month,
year: year,
article_count: entry.count
}
Expand Down