Constantly Contributing Pretty Patches FLCD
•Download as PPTX, PDF•
0 likes•223 views
Many times we developers have come across the perfect contributed module, with a section of code that just doesn't do it for us. Since the Drupal infrastructure is Open to all, it is simpler to take that awesome-ish module and make the changes we need to make it full on awesome. Then we need to take those changes and apply it back to the module and let the whole world bask in the awesome, but we don't get to commit, to Git. (Rule of threes). Therefore we need to create a patch that allows the maintainer of the module to easily combine your great code with theirs. In this session we'll go over the acceptable ways to clone a projects repository, create a great looking patch and contribute said greatness back to the project. Thus, adding to the great chain of life. Oh, was it mentioned that this will work with Drupal Core as well? It should have been.
Recommended
More Related Content
What's hot
What's hot (20)
Viewers also liked
Viewers also liked (15)
Similar to Constantly Contributing Pretty Patches FLCD
Similar to Constantly Contributing Pretty Patches FLCD (20)
More from Mark Casias
Recently uploaded
Recently uploaded (20)
Constantly Contributing Pretty Patches FLCD
- 2. @teampoop /in/markie slideshare.net/teampoop Mark brings a fifteen year programming background and six years of Drupal experience to his role as Senior Drupal Developer at Mediacurrent. Highly involved in his local web community, Mark runs the ABQ Webgeeks Group and started the Albuquerque Drupal Users group. Senior Drupal Developer - Mediacurrent Shameless Self Promotion 1
- 4. Mediacurrent Friday 5 5 things 5 ways 5 minutes on various topics. Video (sorry) Shameless Self Promotion 3
- 5. Hey come work with me! 5 Mediacurrent helps organizations build highly impactful, elegantly designed Drupal websites that achieve the strategic results they need. ● Single-source provider ● Specializing in Drupal since 2007 ● Headquartered in Atlanta, GA ● Team of 60+ Drupal Experts including development, design and strategy ● Clients include: Large Enterprise and high-profile global brands
- 6. She’s my pal This is Dru Last thing about me.
- 7. Why We Contribute Why a Good Patch Create a Good Patch Know your Module Maintainer 4 3 2 1 Use a Good Patch5 Living in the Future6
- 9. Come for the software, Stay for the community ~Drupal Project Motto Why We Contribute
- 10. Every complaint is a contributor who needs guidance. ~Total misquote from @greggles or was it @greggles who told me about it? Why We Contribute
- 12. • Probably not doing this full-time Probably working on something that puts food on the table May not remember creating the project. May not exist (but that’s a different problem) Know your Module Maintainer Your module maintainer
- 13. Short story long: Not at your beck and call! Know your Module Maintainer
- 14. This does not apply to support requests. Thats a different talk. Know your Module Maintainer
- 15. Why a Good Patch
- 16. • Easier to review whats changed. Easy to apply to project. Why make good patches Why a Good Patch
- 17. Things that make a module maintainer sad. Why a Good Patch
- 18. Writing out requested code changes in the comments. Why a Good Patch
- 19. Zipping up a changed project and uploading it to issue. Why a Good Patch
- 20. Forking the project to Github or someplace and saying “check out my changes here”. @Mediacurrent Why a Good Patch
- 21. • No distinct code changes. Can’t easily integrate into project. More work for maintainer. Why a Good Patch
- 22. diff --git a/includes/jplayer.theme.inc b/includes/jplayer.theme.inc index 44a40c6..cb28394 100644 --- a/includes/jplayer.theme.inc +++ b/includes/jplayer.theme.inc @@ -236,6 +236,7 @@ function jplayer_sort_files($raw_files = array(), $player_id = 0, $type = 'singl 'tabindex' => 1, 'onclick' => 'return(false);', ), + 'html' => TRUE, ); if (isset($file) && $file['type'] == 'audio') { $files[][$file['ext']] = $file['url']; diff --git a/includes/jplayer_style_plugin.inc b/includes/jplayer_style_plugin.inc index b0b367b..329cb16 100644 --- a/includes/jplayer_style_plugin.inc +++ b/includes/jplayer_style_plugin.inc @@ -112,7 +112,8 @@ class jplayer_style_plugin extends views_plugin_style { } $this->view->row_index = $row_index; - $label = trim(strip_tags($this->row_plugin->render($row))); + $allowed_tags = array('a', 'em', 'strong', 'cite', 'blockquote', 'code', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'span', 'div'); + $label = trim(filter_xss($this->row_plugin->render($row), $allowed_tags)); if (empty($label)) { $label = basename($filepath); }https://www.drupal.org/files/issues/allow_html_tags_in_playlist-1649102-4.patch Why a Good Patch
- 23. • Distinct code changes. Can easily integrate into project. Forever accessible to the rest of the world. Why a Good Patch
- 24. Creating a good Patch
- 25. Not an original thought! https://www.drupal.org/patch Creating a Good Patch
- 26. Checkout the project. Creating a Good Patch
- 27. git clone --branch 7.x-1.x http://git.drupal.org/project/colorbox.git *branch and project name may vary Creating a Good Patch Check Out the Project
- 28. Create a new, feature branch.git checkout -b [issue-number]-[issue-description] Why? Creating a Good Patch
- 29. Make your awesome changes. work /commit work / commit work /commit Creating a Good Patch
- 30. Create patch from differences between your branch and the development branch. git diff 7.x-1-x > [PROJECT]-[DESCRIPTION]-[ISSUE#]-[COMMENT].patch *Development branch name may vary *Patch name format should NOT. Creating a Good Patch
- 31. Seriously. Name your patches properly. Creating a Good Patch
- 32. Present your awesome back to the project. Creating a Good Patch ●Update issue to “Needs Review”. ●Document your changes. ●Sometimes you gotta nag.
- 33. Using Patches
- 34. Still not an original thought! https://www.drupal.org/patch/apply Using a Patch
- 35. Checkout the project Using a Patch git clone --branch 7.x-1.x http://git.drupal.org/project/colorbox.git Didn’t we just see this?
- 36. Download Patch to folder. Using a Patch
- 37. Apply the happy patches Using a Patch git apply -v path/file.patch
- 38. Damien says: Using a Patch patch -p1 path/file.patch Note to self: get link to blogpost from Damien
- 39. Wait. Don’t Download! Creating a Good Patch curl https://www.drupal.org/files/issues/1307166-42.patch | patch -p1
- 40. Living in the Future
- 41. • Inline comments. • Easier to pull from forked repos. • Single button to merge changes. Living in the Future Pull requests instead of patches.
- 42. Hot-fix Security Updates Living in the Future
- 43. Hot-fix Security Updates Living in the Future
- 44. Living in the Future Hot-fix security fixes
- 45. Living in the Future Hot-fix security fixes
Editor's Notes
- Reduces the number of patch files floating around, so the only patch files on my computer are the ones I created. “git apply” does not apply the patch if it would not apply cleanly. If the patch didn’t apply cleanly then it has to be manually recreated, which can be problematic. Using the “patch” command instead will apply what can be successfully applied and leave .rej files containing the patch pieces or “hunks” for anything that wouldn’t apply correctly.