Skip to content
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.

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

Show what protocol is used for accounts in admin/accounts#index #4622

Merged
merged 2 commits into from Aug 17, 2017

Conversation

@nullkal
Copy link
Collaborator

nullkal commented Aug 17, 2017

What this PR looks like:

This PR adds "protocol" colomn to account list for admin. In addition to it, I added a helper to show protocol names like "OStatus", or "ActivityPub", not "ostatus", nor "activitypub".

@nullkal nullkal changed the title Show what protocol used for in admin/accounts#index Show what protocol is used for accounts in admin/accounts#index Aug 17, 2017
@ykzts
ykzts approved these changes Aug 17, 2017
Copy link
Collaborator

ykzts left a comment

good😄

@Gargron Gargron merged commit 075d6a1 into tootsuite:master Aug 17, 2017
2 checks passed
2 checks passed
codeclimate All good!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
when 'activitypub'
'ActivityPub'
when 'ostatus'
'OStatus'

This comment has been minimized.

Copy link
@nightpool

nightpool Aug 17, 2017

Collaborator

shouldn't this just be a matter of using the correct inflection?

@@ -4,6 +4,9 @@
%td.domain
- unless account.local?
= link_to account.domain, admin_accounts_path(by_domain: account.domain)
%td.protocol
- unless account.local?
= protocol_for_display(account.protocol)

This comment has been minimized.

Copy link
@nightpool

nightpool Aug 17, 2017

Collaborator

should just be acccount.protocol.camel_case

This comment has been minimized.

Copy link
@nullkal

nullkal Aug 17, 2017

Author Collaborator

How about "OStatus"? It's written as ostatus in code, but we want it to be transformed to OStatus. Replacing all occurence of ostatus into o_status is nonsense and (nearly) impossible.

This comment has been minimized.

Copy link
@nightpool

nightpool Aug 17, 2017

Collaborator

@nullkal we already have the inflections defined for this....

lindwurm added a commit to lindwurm/mastodon that referenced this pull request Aug 22, 2017
…suite#4622)

* Show what protocol used for in admin/accounts#index

* Add frozen_string_literal
@nullkal nullkal deleted the show_protocol_in_accounts_index branch Aug 24, 2017
YaQ00 added a commit to YaQ00/mastodon that referenced this pull request Sep 5, 2017
…suite#4622)

* Show what protocol used for in admin/accounts#index

* Add frozen_string_literal
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.