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

Size column #1023

Merged
merged 5 commits into from Mar 9, 2022
Merged

Size column #1023

merged 5 commits into from Mar 9, 2022

Conversation

ghost
Copy link

@ghost ghost commented Mar 8, 2022

This patch hides the "Size" and "total_size" variables according to the role and project status.

Fixes #1008.

  • Tests passing
  • Black formatting
  • [ - ] Migrations for any changes to the database schema
  • Rebase/merge the dev branch
  • Note in the CHANGELOG

Zishan Mirza added 2 commits March 8, 2022 12:13
This patch hides the "Size" and "total_size" variables according
to the role and project status.

Signed-off-by: Zishan Mirza <[email protected]>
@codecov
Copy link

codecov bot commented Mar 8, 2022

Codecov Report

Merging #1023 (23869d1) into dev (288f5ab) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##              dev    #1023      +/-   ##
==========================================
+ Coverage   87.59%   87.61%   +0.01%     
==========================================
  Files          27       27              
  Lines        2943     2946       +3     
==========================================
+ Hits         2578     2581       +3     
  Misses        365      365              
Impacted Files Coverage Δ
dds_web/api/project.py 89.13% <100.00%> (+0.10%) ⬆️
dds_web/api/files.py 83.82% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 288f5ab...23869d1. Read the comment docs.

@i-oden i-oden marked this pull request as draft March 8, 2022 13:38
@i-oden i-oden assigned ghost Mar 8, 2022
@i-oden i-oden added the must have Cannot deliver on target date without this label Mar 8, 2022
dds_web/api/project.py Outdated Show resolved Hide resolved
@i-oden
Copy link
Member

i-oden commented Mar 8, 2022

@zishanmirza Can you also add a row to the changelog?

@i-oden i-oden marked this pull request as ready for review March 9, 2022 07:59
This patch updates "CHANGELOG.md" and switches the condition
in the "if" statement to "total_size".

Signed-off-by: Zishan Mirza <[email protected]>
@ghost
Copy link
Author

ghost commented Mar 9, 2022

I have updated CHANGELOG.md.

dds_web/api/project.py Outdated Show resolved Hide resolved
Copy link
Member

@i-oden i-oden left a comment

Choose a reason for hiding this comment

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

Add the current_user.role check too

dds_web/api/project.py Outdated Show resolved Hide resolved
Zishan Mirza added 2 commits March 9, 2022 12:52
This patch adds roles to the condition of the "if" statement.

Signed-off-by: Zishan Mirza <[email protected]>
Copy link
Member

@i-oden i-oden left a comment

Choose a reason for hiding this comment

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

Looks good!

@i-oden i-oden merged commit d57f2c5 into ScilifelabDataCentre:dev Mar 9, 2022
@ghost ghost deleted the size_column branch March 16, 2022 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
must have Cannot deliver on target date without this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Hide project sizes from researchers when project not Available
1 participant