From: Martin B. <dr....@t-...> - 2014-02-16 18:19:08
|
Am 16.02.2014 18:49, schrieb Martin Brumm: > > On 16.02.2014 17:45, Martin Brumm wrote: >> Am 16.02.2014 15:51, schrieb Stefan Frey: >>> Martin & Mike: >>> I have some troubles with the rails_2_develop_1880 branch: On my system >>> there are several compile errors (12) in this branch, that do not seem >>> to be linked to the issue discussed below. >>> Are you sure you pushed everything to this branch? >>> Stefan >>> >>> On 02/10/2014 02:58 PM, Michael Alexander wrote: >>>> The reason I did that originally was to determine when a foreign >>>> investor was connected to it's parent company. I was having trouble >>>> with the existing implementation because it was "connecting" through an >>>> off-map station (going in one side and out the other). I had thought at >>>> the time that there was no other way I could do it. >>>> >>>> As it turns out, a handful of weeks after that, I noticed that the >>>> off-map station was defined wrong in the XML. I suspect that once it >>>> was defined correctly (which I did), that the original >>>> NetworkCompanyGraph would have worked - but I wasn't sure it was worth >>>> changing it back until 2.0. >>>> >>>> The function that has to work is Investor_1880::isConnectedtoLinkedCompany() >>>> >>>> Mike >>>> >>>> >>>> >>>> >> Good Evening, >> >> @Stefan: I found in my migration effort that certain Fixes/Enhancement >> Erik had done to the basis code to enable flexible handling of player >> ordering (reordering the seating of players) had not been pushed to the >> rails 2 branch, you probably cherry picked the fixes and didnt transport >> the 1880 related improvements at that time. >> >> The compile errors come mostly from that parts thats currently in >> migration into the 2_develop_1880 branch. >> >> I didnt have enough time this weekend to fix everything there. Hopefully >> i'll find some time tonight or on the week. >> Reason why i pushed that code is, i use different machines to work >> during weekdays or weekends on that branch. >> >> Regards, >> Martin >> >> >> >> > The commit in question is > Commit e5581e31305d172a7ff5d68ede5e5fe0207165bc from Erik. > > Regards, > Martin > Upon revisiting the code: Commit b95fd7fd0bf822a8f22a8f275166402ca7c3a9f701ef9 is also not in Rails 2.0. It added the basic feature to be able to reorder players and some mechanismn to display those changes in the UI. Any advice on how to proceed here ? Regards, Martin |