Hi, 1. I applied the patches in order, and after each patch tested to see if things still work. I expect on each patch in a patchset to leave things in an workable state, no unresolved dependencies in a future patch. So if I need to apply a views.py patch, that should come either before this patch, or, if there is a circular dependency (i.e. views and templates change together), the changes must be part of the same patch.
2. yes, you need to rebase on top of toaster/master; the way that I do it: - I have a local toaster/master which follows upstream poky-contrib/toaster/master - I have my development branch based on the local toaster/master When I need to rebase, - I do git pull on the local toaster/master branch, and then - move to the development branch and do git rebase -i toaster/master Hope this helps, Alex On Mon, Jan 20, 2014 at 2:54 PM, Ravi Chintakunta < [email protected]> wrote: > Hi Alex, > > > > 1. The filter dialog has been changed to use options name and value > as tuples and that may be the reason you are seeing only the first letters. > Did you change the code in views.py to set the filter options as tuples? > > 2. To check that the All tasks feature patch applies, should I fetch > from toaster/master and then rebase? > > > > Thanks, > > Ravi > > > > *From:* Damian, Alexandru [mailto:[email protected]] > *Sent:* Monday, January 20, 2014 7:16 AM > *To:* Ravi Chintakunta > *Cc:* Paul Eggleton; Barros Pena, Belen; Reyna, David L (Wind River); > Lerner, David M (Wind River); Zhang, Jessica; [email protected] > *Subject:* Re: git push for base html, base table, custom tags, fitler > dialog and All Tasks feature to ravi/all-tasks-feature > > > > Hello, > > I have taken in some of the patches in this branch, with changes: > > - "viewName" was also implemented, of sorts, as "objectname". I have > replaced "{{viewName}}" with "{{objectname|title}}" as to capitalize the > name > > - whitespace fixes; please don't do whitespace at the end of a line. > > > > What I didn't take: > > * bitbake: toaster: Filter Dialog fix to display filter options as radio > buttons > > - The option names are only showing the first letter. > > * bitbake: toaster: All Tasks Feature with sorting and filtering > > - Does not apply cleanly on the latest version. Please rebase > > - Whitespace at the end of lines. > > Thank you, > Alex > > > > > > > > On Sat, Jan 18, 2014 at 4:20 PM, Ravi Chintakunta < > [email protected]> wrote: > > I have completed > > the All Tasks feature > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=4275 > > and > > filtering tasks in a table > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=4278 > > and pushed it to ravi/all-tasks-feature branch: > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=ravi/all-tasks-feature&id=f75622b67a86ff9b14c6ef4b902c324be573e9a1 > > > > The push also includes fixes to: > > 1. Base html - to set the title of the page > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=ravi/all-tasks-feature&id=46353d4bfdd8176244599b80b81ed27bf720ddac > > 2. Base table - Fix the header text style, sort icon, filter icon > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=ravi/all-tasks-feature&id=426874b4139618dd25a774a7c113097f75938be9 > > 3. Custom Tags - Added custom tags for setting color based on task > outcome, filter icon, filter icon tooltip, display zero and other values as > blank. > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=ravi/all-tasks-feature&id=ac2f8b18d2a728efb0b5bccce6be7f9e5acb467b > > 4. Filter Dialog - Modified it to display the filter options as radio > buttons, and changed the filter options data structure from dictionary to > list so that the order of the filter options is preserved. > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=ravi/all-tasks-feature&id=2a8742d6e7ce75cd9b6f854874b2ac15a58a45ab > > Few of these were pushed previously, but now I have cleaned up the commit > message and grouped multiple commits based on the functionality. > > Please review and let me know what you think. > > Thanks, > Ravi > > > > > > -- > > Alex Damian > > Yocto Project > > SSG / OTC > -- Alex Damian Yocto Project SSG / OTC
_______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
