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

Revert "Add basic text for Ukraine (#2074)" #2325

Merged
merged 1 commit into from
Aug 2, 2022
Merged

Conversation

fballiano
Copy link
Contributor

Our customers' backends don't need to have an undismissable message like the one that was introduces with #2074.
That same message could have been delivered in the notification feed, instead of hardcoding it and adding an image file to our repository (while at the same time we create BC PRs to remove a few characters from file names).

#2074 will not help that cause in any way and it's only creating a disservice to the users of OM's backend.

@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml documentation Template : admin Relates to admin template labels Jul 17, 2022
@github-actions

This comment has been minimized.

@Flyingmana
Copy link
Contributor

I see it differently and think its at maximum a minor disturbance and acceptable to keep it this way till the territory of the Ukraine got restored.

@addison74
Copy link
Contributor

I approve this PR not because I am not in solidarity with the Ukrainians. The PR #2074 doesn't provide the option to dismissed the message. It would stay there until the user changes the source code or we revert it to the end of the war.

The variant that used the OpenMage feed would have been best in this case, as there would have been a message in the Notifications section of the Backend which could then be marked as read or deleted.

@fballiano
Copy link
Contributor Author

It shouldn't even be necessary to say but obviously this PR has nothing to do with being against this or any other war.
I just think that a message in a software does nothing for the cause, there are many ways of actually doing something and I think this is not one of them.

@midlan
Copy link
Contributor

midlan commented Jul 20, 2022

100% agree

The right solution has been mentioned:

That same message could have been delivered in the notification feed

Hardcoding anything anywhere is bad idea.

@sreichel
Copy link
Contributor

@Flyingmana what's required to move this to feed? Just update OM/Web_Notification?

@Flyingmana
Copy link
Contributor

@Flyingmana what's required to move this to feed? Just update OM/Web_Notification?

yes, adding a post analog to https://github.com/OpenMage/Web_Notifications/blob/master/_posts/2019-06-24-OpenMage.md

@sreichel
Copy link
Contributor

sreichel commented Aug 2, 2022

Anyone? I agree that this harcdoded message was wrong, but in don't wont to merge as long the feed isnt updated :)

fballiano added a commit to fballiano/Web_Notifications that referenced this pull request Aug 2, 2022
@fballiano
Copy link
Contributor Author

Although I don't agree with these messages in software I created the web notification post with OpenMage/Web_Notifications#4

This way we don't even have to release (and people don't even need to upgrade) in order to receive the message.

@sreichel sreichel merged commit a252af8 into 1.9.4.x Aug 2, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Aug 2, 2022

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
7 runs  ±0  5 ✔️ ±0  2 💤 ±0  0 ❌ ±0 

Results for commit a252af8. ± Comparison against base commit 33dfa26.

@sreichel sreichel deleted the revert-2074-ua branch August 2, 2022 13:50
sreichel added a commit that referenced this pull request Aug 12, 2022
* Merge PR #2342

* Revert "Add basic text for Ukraine (#2074)" (#2325)

This reverts commit 33dfa26.

* Mage_Catalog_Model_Product_Attribute_Backend_Groupprice_Abstract: avoid loading all websites when using only the current one (#2351)

* Added support for HTTP2 to Mage_HTTP_Client_Curl (#1137)

* Blocked access to all dot files (#2349)

* Capitalization Adjustment Regarding CamelCase in Method Names (#2365)

* refactor: Adjusted capitalization of two public methods.

* refactor: Adjusted capitalization of one protected method.

* refactor: Adjusted capitalization of where call.

* chore: Removed fixed error from phpstan baseline.

* Some microoptimization (#2335)

* Avoid duplicate method calls

* Replaced array_push()

* Changed substr() third parameter

* Use array_key_exists()

* php7 opcode - internal functions

* Enclosed error with <pre> tag for prettier error print (if developer mode is enabled). (#2368)

* Updated phpstan to 1.8.2 (#2367)

* Escape product titles in MSRP JavaScript (#2366)

* Product names were not escaped. If contained a double quote, would break the JavaScript for MSRP/MAP

* update contribution list

* Update boxes.css (#2330)

* Force describeTable() to use read DB adapter (#2371)

* Do not install n98/n98_layouthelper (#2373)

* Add apt update to XML validation workflow (#2376)

* Merged PR #2375

* Replace remaining "sizeof" calls with "count" (#2369)

* Remove DISCLAIMER and change Magento -> OpenMage in header (#2297)

* Added label for phpstan cosmetic changes (#2384)

* Added weight to salesOrderShipmentAddTrack API (#1377)

* PHPStan/DOCBlock fixes (#2336)

* Updated docs for email addTo() (#2382)

* Updated phpstan experimental (#2386)

* Cosmetic changes to Mage_Payment_Model_Method_Abstract::validate() (#2388)

* Replaced join() calls with implode() (#2389)

* Hidden empty sub menu from backend (#2391)

* Remove Thumbs.db file (#2394)

* Support PHP 8.1 in composer.json (#2378)

* php condition in composer.json

This solves the issue related to php versions > 8.1

* Reduced condition for PHP requirement

* Changed PHP requirement

* Updated version in Ubuntu 22.04 based on PHP 8.1.2

* Composer.lock updated in Ubuntu 20.04 (PHP 8.1.2)

* Update composer.lock

* Update composer.lock

* Blocked various file types in .htaccess (#2359)

* Color swatches work with disparate product IDs (#2390)

* Move Credit Memo at the end of the buttons list (#2392)

* Version bump (#2387)

* Minor fixes on 'filter_condition_callback' method _filterStoreCondition() (#2362)

* add ReturnTypeWillChange to various Files catched by code style checker #2302

* Phpstan fixes (#2396)

* Fixed addCrumb()

* Fixed initForm() and _needToAddDummy()

* Fixed addLink()

* Fixed addLinkRel()

* Fixed canUseCanonicalTag()

* Fixed getAddUrl...()

* Fixed rollBack() camelCase error reported by phpstan (#2403)

* Changes default root dir in composer.json (#2401)

* Fixed targetNamespace for WS-I Compliant SOAP APIs (#2405)

* Updated phpstan baseline

Co-authored-by: sv3n <[email protected]>
Co-authored-by: Fabian Blechschmidt <[email protected]>
Co-authored-by: Colin Mollenhour <[email protected]>
Co-authored-by: Kevin Jakob <[email protected]>
Co-authored-by: Ng Kiat Siong <[email protected]>
Co-authored-by: Scott Moore <[email protected]>
Co-authored-by: ADDISON <[email protected]>
Co-authored-by: Justin Beaty <[email protected]>
Co-authored-by: luigifab <[email protected]>
Co-authored-by: Daniel Fahlke <[email protected]>
Co-authored-by: leissbua <[email protected]>
@sreichel
Copy link
Contributor

@Flyingmana can you please update OM/Web_Notification?

Flyingmana pushed a commit to OpenMage/Web_Notifications that referenced this pull request Jan 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Adminhtml Relates to Mage_Adminhtml documentation Template : admin Relates to admin template
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants