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.

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

Issue#1195 Improve Pool Delete UX #1436

Merged
merged 15 commits into from
Nov 19, 2016
Merged

Issue#1195 Improve Pool Delete UX #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
89d018b
Fix /api/pool/<pname> from throwing error
gkadillak Sep 11, 2016
71c6885
Reformat base js view
gkadillak Sep 11, 2016
aaa1963
Pass down collection of shares
gkadillak Sep 15, 2016
67b7ae3
Show share size in delete modal
gkadillak Sep 19, 2016
ee1f58a
Tabs are evil
gkadillak Sep 22, 2016
60abce8
Small spacing changes
gkadillak Sep 22, 2016
681fe46
Functions spaced awkwardly
gkadillak Sep 22, 2016
988e6ca
Reformat base js view
gkadillak Sep 11, 2016
cafda50
Pass down collection of shares
gkadillak Sep 15, 2016
11901b3
Show share size in delete modal
gkadillak Sep 19, 2016
664d8e6
Tabs are evil
gkadillak Sep 22, 2016
62517ac
Small spacing changes
gkadillak Sep 22, 2016
689e4a8
Functions spaced awkwardly
gkadillak Sep 22, 2016
245c90b
Update /pools Delete Modal
gkadillak Oct 31, 2016
8f7f86c
Update /pool delete modal to be same as /pool/<pool name>
gkadillak Oct 31, 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: 4 additions & 0 deletions src/rockstor/storageadmin/models/share.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,9 @@ class Share(models.Model):
rusage = models.BigIntegerField(default=0)
eusage = models.BigIntegerField(default=0)

@property
def size_gb(self):
return self.size / (1024.0 * 1024.0)

class Meta:
app_label = 'storageadmin'
7 changes: 7 additions & 0 deletions src/rockstor/storageadmin/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ class Meta:
model = IscsiTarget


class SharePoolSerializer(serializers.ModelSerializer):
size_gb = serializers.FloatField()

class Meta:
model = Share


class ShareSerializer(serializers.ModelSerializer):
snapshots = SnapshotSerializer(many=True, source='snapshot_set')
pool = PoolInfoSerializer()
Expand Down
Loading