scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-15 17:33:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2482 from okriuchykhin/ok_SCI_4479

Browse source 
Fix taken space display for teams [SCI-4479]
This commit is contained in:
Alex Kriuchykhin 2020-03-23 16:53:47 +01:00 committed by GitHub
commit c09ef36f52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/serializers/api/v1/team_serializer.rb
View file

@ -5,6 +5,10 @@ module Api
class TeamSerializer < ActiveModel::Serializer class TeamSerializer < ActiveModel::Serializer
attributes :id, :name, :description, :space_taken attributes :id, :name, :description, :space_taken
belongs_to :created_by, serializer: UserSerializer belongs_to :created_by, serializer: UserSerializer
def space_taken
object.storage_used.to_i
end
end end
end end
end end

2
app/views/users/settings/teams/show.html.erb
View file

@ -50,7 +50,7 @@
<div class="space-usage grid-block"> <div class="space-usage grid-block">
<span class="fas fa-hdd"></span> <span class="fas fa-hdd"></span>
<span class="hidden-xs hidden-sm"><%= t("users.settings.teams.edit.header_space_taken") %></span> <span class="hidden-xs hidden-sm"><%= t("users.settings.teams.edit.header_space_taken") %></span>
<b data-hook="team-space-taken"><%= "#{number_to_human_size(@team.space_taken)}" %></b> <b data-hook="team-space-taken"><%= "#{number_to_human_size(@team.storage_used)}" %></b>
</div> </div>
</div> </div>