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

SHARE-555 child restriction #4783

Merged
merged 2 commits into from
Apr 19, 2024
Merged

SHARE-555 child restriction #4783

merged 2 commits into from
Apr 19, 2024

Conversation

makne17
Copy link
Contributor

@makne17 makne17 commented Feb 24, 2024

added not for kids property to admin panel
added button to change not for kids flag
added not for kids flag in meta data


Your checklist for this pull request

Please review the contributing guidelines and wiki pages of this repository.

  • Include the name and id of the Jira ticket in the PR’s title eg.: SHARE-666 The devils ticket
  • Choose the proper base branch (develop)
  • Confirm that the changes follow the project’s coding guidelines
  • Verify that the changes generate no warnings and errors
  • Verify to commit no other files than the intentionally changed ones
  • Include reasonable and readable tests verifying the added or changed behavior
  • Verify that all tests are passing (CI), if not please state the test cases in the section below
  • Perform a self-review of the changes
  • Stick to the project’s git workflow (rebase and squash your commits)
  • Verify that your changes do not have any conflicts with the base branch
  • Put your ticket into the Code Review section in Jira
  • Post a message in the #catroweb Slack channel and ask for a code reviewer
  • Check that your pull request has been successfully deployed to https://web-test-1.catrob.at/

Additional Description

TODO: Add additional information that is not in your commit-message here

Tests - additional information

TODO: add additional information about testruns here

@makne17 makne17 force-pushed the SHARE-555 branch 3 times, most recently from f7b07c9 to e59ffd4 Compare February 24, 2024 16:17
Copy link

codecov bot commented Feb 24, 2024

Codecov Report

Attention: Patch coverage is 43.58974% with 44 lines in your changes are missing coverage. Please review.

Project coverage is 41.15%. Comparing base (1e5db9b) to head (5c9a852).
Report is 128 commits behind head on develop.

Files Patch % Lines
...System/Commands/Create/CreateNotForKidsCommand.php 34.78% 15 Missing ⚠️
...plication/Controller/Project/ProjectController.php 0.00% 14 Missing ⚠️
src/System/Commands/Reset/ResetCommand.php 0.00% 12 Missing ⚠️
...m/Testing/Behat/Context/CatrowebBrowserContext.php 0.00% 2 Missing ⚠️
.../Api/Services/Projects/ProjectsResponseManager.php 75.00% 1 Missing ⚠️
Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #4783      +/-   ##
=============================================
- Coverage      47.36%   41.15%   -6.22%     
- Complexity      5926     5940      +14     
=============================================
  Files            669      670       +1     
  Lines          20982    21057      +75     
=============================================
- Hits            9939     8666    -1273     
- Misses         11043    12391    +1348     
Flag Coverage Δ
behat 38.04% <43.58%> (-6.86%) ⬇️
phpunit 8.33% <0.00%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@makne17 makne17 force-pushed the SHARE-555 branch 3 times, most recently from 8799d61 to 72b5a50 Compare February 26, 2024 16:08
@makne17
Copy link
Contributor Author

makne17 commented Feb 26, 2024

CAPI Model/ProjectResponse fehlt noch die Variable not_for_kids, hab sie zur catroweb.yaml file hinzugefügt wurde auch schon gemerged

Edit: -> #4799

@@ -1038,5 +1042,6 @@ maintenanceinformations:
feature_2: 'The Feature'
feature_3: 'The Feature'


MarkNotForKids: Mark as not for kids
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
MarkNotForKids: Mark as not for kids
MarkNotForKids: Mark as not safe for kids

@@ -1027,6 +1028,9 @@ media_library:

snackbar:
project_not_found: 'The requested project is not available'
project_not_for_kids: 'The project was marked as not for kids!'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
project_not_for_kids: 'The project was marked as not for kids!'
project_not_for_kids: 'The project was marked as safe not for kids!'

if (null === $project) {
return $this->redirectToIndexOnError();
}
if (2 == $project->getNotForKids()) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
if (2 == $project->getNotForKids()) {
if (<const>== $project->getNotForKids()) {

Use constants please

@dmetzner
Copy link
Collaborator

dmetzner commented Mar 1, 2024

@makne17 api is now merged, just rebase :)

added not for kids property to admin panel
added button to change not for kids flag
added not for kids flag in meta data
@dmetzner dmetzner merged commit e16b9e6 into Catrobat:develop Apr 19, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants