gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Restful refactor of accounts/ routes (#2133)

Browse source 
* Add routing specs for accounts followers and following actions

* Use more restful route naming for public account follow pages

Moves two actions:
- accounts#followers to accounts/follower_accounts#index
- accounts#following to accounts/following_accounts#index

Adds routing spec to ensure prior URLs are preserved.
This commit is contained in:
Matt Jankowski 2017-04-19 07:52:37 -04:00 • committed by Eugen
parent c0b30c56db
commit 8bac0350d1
18 changed files with 275 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/accounts/_header.html.haml
View file

@ -2,9 +2,9 @@
- if user_signed_in? && current_account.id != account.id && !current_account.requested?(account)
.controls
- if current_account.following?(account)
= link_to t('accounts.unfollow'), unfollow_account_path(account), data: { method: :post }, class: 'button'
= link_to t('accounts.unfollow'), account_unfollow_path(account), data: { method: :post }, class: 'button'
- else
= link_to t('accounts.follow'), follow_account_path(account), data: { method: :post }, class: 'button'
= link_to t('accounts.follow'), account_follow_path(account), data: { method: :post }, class: 'button'
- elsif !user_signed_in?
.controls
.remote-follow
@ -24,11 +24,11 @@
= link_to short_account_url(account), class: 'u-url u-uid' do
%span.counter-label= t('accounts.posts')
%span.counter-number= number_with_delimiter account.statuses_count
.counter{ class: active_nav_class(following_account_url(account)) }
= link_to following_account_url(account) do
.counter{ class: active_nav_class(account_following_index_url(account)) }
= link_to account_following_index_url(account) do
%span.counter-label= t('accounts.following')
%span.counter-number= number_with_delimiter account.following_count
.counter{ class: active_nav_class(followers_account_url(account)) }
= link_to followers_account_url(account) do
.counter{ class: active_nav_class(account_followers_url(account)) }
= link_to account_followers_url(account) do
%span.counter-label= t('accounts.followers')
%span.counter-number= number_with_delimiter account.followers_count