? ? Pending

User tests: Successful: Unsuccessful:

avatar richard67
richard67
30 Nov 2021

Pull Request for Issue # .

Summary of Changes

With PR #34407 file "administrator/templates/atum/scss/pages/_com_joomlaupdate.scss" has been removed from the sources, and so it has been added to section "// 4.0 from RC 1 to RC 2" of the list of files to be deleted on update in script.php .

Later with PR #35076 (same author as the previously mentioned PR), the file was added back, but it has not been removed from script.php, and the "build/deleted_file_check.php" can't know that and will always add it back when creating the list and comparing 4.0 RC 1 and RC 2.

That means on each core update of J4, the file will be deleted.

This PR here fixes this by removing the file from the list of files to be deleted in script.php.

It would also need to add it to the list of files to be kept in "build/deleted_file_check.php" so the tool will not add it back when rebuilding the complete list from scratch.

But in 4.1 the scss file has to be added back to the list in script.php because it will be moved to the media folder due to the child template change.

This means that the the change in "build/deleted_file_check.php" in the 4.0-dev branch would have to be reverted in the 4.10-dev branch, or in other words, the 4.0-dev branch and the 4.1-dev branch would have different versions of "build/deleted_file_check.php".

I want to avoid this and so I don't change "build/deleted_file_check.php" with this PR here.

As I'm the one who currently maintains the files and folders deletion in script.php, I will add information on that to my documentation here richard67#20 .

Testing Instructions

Code review.

Actual result BEFORE applying this Pull Request

File "administrator/templates/atum/scss/pages/_com_joomlaupdate.scss" is deleted when updating from 4.0.x to 4.0.y.

Expected result AFTER applying this Pull Request

File "administrator/templates/atum/scss/pages/_com_joomlaupdate.scss" is not deleted when updating from 4.0.x to 4.0.y.

Documentation Changes Required

None.

avatar richard67 richard67 - open - 30 Nov 2021
avatar richard67 richard67 - change - 30 Nov 2021
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 30 Nov 2021
Category Administration com_admin
avatar brianteeman
brianteeman - comment - 30 Nov 2021

I have tested this item successfully on bf42d29


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/36161.

avatar brianteeman brianteeman - test_item - 30 Nov 2021 - Tested successfully
avatar alikon alikon - test_item - 30 Nov 2021 - Tested successfully
avatar alikon
alikon - comment - 30 Nov 2021

I have tested this item successfully on bf42d29


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/36161.

avatar alikon alikon - change - 30 Nov 2021
Status Pending Ready to Commit
avatar alikon
alikon - comment - 30 Nov 2021

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/36161.

avatar richard67
richard67 - comment - 30 Nov 2021

Ping @wilsonge :-)

avatar wilsonge wilsonge - change - 30 Nov 2021
Status Ready to Commit Fixed in Code Base
Closed_Date 0000-00-00 00:00:00 2021-11-30 15:40:44
Closed_By wilsonge
Labels Added: ? ?
avatar wilsonge wilsonge - close - 30 Nov 2021
avatar wilsonge wilsonge - merge - 30 Nov 2021
avatar wilsonge
wilsonge - comment - 30 Nov 2021

Thanks!

Add a Comment

Login with GitHub to post a comment