[01:41] daker, ping around? [01:53] mhall119: hey, I see a problem on the MPs from slangasek: he seems to be branching lp:summit/production, hacking, and pushing to lp:summit [01:53] the one that has just been merged, for example, changed the version number to follow production instead of trunk [01:54] I can fix it, but I don't think this is what we want [01:58] mhall119: ping? [03:27] jose: hey, I've merged his branches after I reverted changes to version.py [03:27] oh, got it [03:27] he knows now to branch from trunk and propose MPs back to trunk, so it shouldn't happen again [03:27] cool [03:28] I should get back to a bug I have assigned on 'back to schedule' buttons once I'm done with this seafile charm - seems promising [03:28] jose: FYI, slangasek is going to use Summit for debconf, so there will be some changes coming in to support that [03:28] for example: https://code.launchpad.net/~mhall119/summit/custom-registration-form/+merge/215795 [03:29] awesome, thanks for the heads up [03:32] np, sorry I didn't mention it earlier, I've been ignoring IRC to get those landed :) [03:34] I noticed :P [03:36] alright, off to bed now [03:37] have a good night! [03:40] mhall119: well, our branch is branched from prod (because "prod"), so there's a good chance you'll continue to see traces of that in future MPs.... why is the version number on trunk different than on prod? [03:41] mhall119: incidentally, have you looked at our latest code? We have a registration form put together... it's not based on the attendee form because we've subclassed the model, not sure if the custom-registration-form above still benefits us then? [03:43] slangasek: it does, you'll still need to use attendee somehow [03:43] mhall119: we're using attendee by subclassing it [03:43] seems to work fine :) [03:43] slangasek: afaik, code to prod is only pushed when there's a new release [03:43] you can either use a subclass of Attendee, or something with a FK to Attendee, but you're going to need to create/update the Attendee record one way or another [03:44] jose is right, you should work on Summit's trunk, not prod [03:45] slangasek: you'll be passed the Attendee record for the user, or a new, unsaved Attendee instance for that user, which you can use to find/create your subclass [03:45] mhall119: yes, /we are already doing that/ [03:45] ok, perfect [03:46] so I don't see how the above code change relates to what we're doing, since we already have this working without the above [03:46] so with the above MP you just need to set REGISTRATION_FORM_VIEW in your debconf_settings.py [03:46] slangasek: the above MP will make the current registration link and page use your view function instead of the built-in one Summit uses [03:46] which replaces having a separate urlpattern declaration for it? [03:47] yes [03:47] ok [03:47] which means the template doesn't need to change either [03:47] we've modified the template a fair bit [03:47] summit.html? [03:47] or website_base.html? [03:48] registration.html [03:48] where is registration.html? [03:48] debconf_website/templates/registration.html [03:49] ah, that's fine then [03:49] you can do whatever you want with template in debconf_website/templates/ [03:49] I was talking about not needing to change the summit.html template that produces the link to the registration form [03:50] your REGISTRATION_FORM_VIEW can use whatever template you want to display your form [03:50] ah; well we didn't need to change that either, because we just redirected the url elsewhere :) [03:51] well, now you don't need to do that either :) [03:51] ok, off to bed for real this time [03:51] slangasek: if you can add/update test cases for any MPs against Summit, that would help them land [03:52] ok [03:52] I've updated trunk to fix some (5) tests that had been broken [03:52] also, python-mock is now a dependency for running the test suite [03:52] well, it is with my MP above, so when that is approved and lands [18:32] slangasek: are you planningon using Summit's sponsorship section, or do you have your own? [18:33] mhall119: would be using the summit one [18:35] ok, it doesn't work in django 1.6. FYI [19:07] FAILED (failures=8, errors=78) on Django 1.6, this is going to be fun