When you drag and drop a file in the Phriction editor and then save the
corresponding wiki document, the file was only visible by the author.
Now the file is also attached to that document, making it visible.
Refs T15106
Differential D25705
Fix missing file attachment in Phriction mturdus on Jun 29 2024, 18:11. Authored by
Details
When you drag and drop a file in the Phriction editor and then save the Now the file is also attached to that document, making it visible. Refs T15106
Diff Detail
Event Timeline
Comment Actions Fix file attachment in Conpherence Summary: Refs T15106 Test Plan:
Comment Actions (Do you need a little help to split the changes in two diffs?) You may like also this: $attached_phids = idx($metadata, 'attachedFilePHIDs', array()); Found here: So just do isset($attached_phids) && is_array(...) etc. Comment Actions Well, to be honest, feel free to generalize the description and commit message to include both changes, since they are the very same thing Comment Actions OK try this to restore your desired situation (so, two diffs) git stash save git checkout -b just_phriction git reset --hard origin/master arc patch --nobranch --diff 2173 arc diff --update D25705 git checkout -b just_conpherence git reset --hard origin/master arc patch --nobranch --diff 2178 arc diff --create Then you have this benefit that you can repeat as many times you want: git checkout just_phriction LOL DO CHANGES arc diff git checkout just_conpherence LOL DO CHANGES arc diff Or, get fresh master again: git checkout master Ideally, the default assumes that people do not touch master but work in branches, each branch a different feature Comment Actions We can avoid phutil_nonempty_string() since PHP pitfalls "Check for non-empty strings" are under control here. https://we.phorge.it/book/flavor/article/php_pitfalls/ Aaaaand... this was my last contribution here. Thanks again. Comment Actions I Thanks I will remember this for the future :-) But since you have split these 2 up, I'm a bit confused now how I can land only the Phriction part. This is my current git status and show HEAD state: gj@blackbird:/var/www/htdocs/phorge/phorge$ git status On branch master Your branch is ahead of 'origin/master' by 1 commit. (use "git push" to publish your local commits) nothing to commit, working tree clean gj@blackbird:/var/www/htdocs/phorge/phorge$ git show --name-only HEAD commit 8e8372e2a79a226bd874858488c6738c784e87ee (HEAD -> master) Author: Merula Turdus <merula.turdus@outlook.be> Date: Sat Jun 29 20:08:40 2024 +0200 Fix file attachment in Phriction Summary: when you drag and drop a file in the Phriction editor and then save the corresponding wiki document, the file is only visible by the author. Refs T15106 Test Plan: 1) open the Phriction editor to edit an existing or create a new wiki document 2) drag and drop file in it 3) save wiki document 4) verify file is attached to wiki document (other user can see file in wiki page) Reviewers: O1 Blessed Committers! Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Maniphest Tasks: T15106 Differential Revision: https://we.phorge.it/D25705 src/applications/conpherence/controller/ConpherenceUpdateController.php src/applications/phriction/controller/PhrictionEditController.php Are these the correct steps: git reset HEAD~1 git restore src/applications/conpherence/controller/ConpherenceUpdateController.php arc diff --update D25705 arc land Comment Actions If you would like to download the current version of D25705 to maybe land that, just: arc patch D25705 arc land Comment Actions Or, to just download the current version of D25705 to eventually add some local extra changes, just: arc patch D25705 DO CHANGES arc diff DO CHANGES arc diff DO CHANGES arc diff |