Merge lp:~tamisoft/redminelocalavatars/redmine-1.4 into lp:redminelocalavatars

[Tamisoft]

Added routes.rb for redmine 1.4 compatibility.
-sorry changed the username in the meanwhile

[Luca Pireddu (pireddu)]

Approved on faith.

review: Approve

[Luca Pireddu (pireddu)]

Hi Levente. I don't have a newer version of Redmine installed to test
your patch, but I've gone ahead and merged it anyways. I trust you've
tested it and can confirm it works properly. If you can confirm that
your modifications resolved the two bugs you marked as related
(#788154 and #805863) I'll mark them as fixed as well.

Thanks for the patch!

Luca

On 19 February 2012 14:51, Luca Pireddu <email address hidden> wrote:
> The proposal to merge lp:~tamisoft/redminelocalavatars/redmine-1.4 into lp:redminelocalavatars has been updated.
>
>    Status: Needs review => Merged
>
> For more details, see:
> https://code.launchpad.net/~tamisoft/redminelocalavatars/redmine-1.4/+merge/93681
> --
> https://code.launchpad.net/~tamisoft/redminelocalavatars/redmine-1.4/+merge/93681
> You are requested to review the proposed merge of lp:~tamisoft/redminelocalavatars/redmine-1.4 into lp:redminelocalavatars.

[Tamisoft (tamisoft)]

hey Luca,
I assume they both suffered from the same problem, but as both of those
versions of redmine are outdated, we can't really be sure. If I were you
I'd just wait what they say, I related the patch to those issues as well.

Have fun
Levi

On 2012.02.19. 16:01, Luca Pireddu wrote:
> Hi Levente. I don't have a newer version of Redmine installed to test
> your patch, but I've gone ahead and merged it anyways. I trust you've
> tested it and can confirm it works properly. If you can confirm that
> your modifications resolved the two bugs you marked as related
> (#788154 and #805863) I'll mark them as fixed as well.
>
> Thanks for the patch!
>
> Luca
>
> On 19 February 2012 14:51, Luca Pireddu<email address hidden> wrote:
>> The proposal to merge lp:~tamisoft/redminelocalavatars/redmine-1.4 into lp:redminelocalavatars has been updated.
>>
>> Status: Needs review => Merged
>>
>> For more details, see:
>> https://code.launchpad.net/~tamisoft/redminelocalavatars/redmine-1.4/+merge/93681
>> --
>> https://code.launchpad.net/~tamisoft/redminelocalavatars/redmine-1.4/+merge/93681
>> You are requested to review the proposed merge of lp:~tamisoft/redminelocalavatars/redmine-1.4 into lp:redminelocalavatars.

[Luca Pireddu (pireddu)]

Sounds good. Thanks for the patch!

Luca

On 19 February 2012 17:31, Tamisoft <email address hidden> wrote:
> hey Luca,
> I assume they both suffered from the same problem, but as both of those
> versions of redmine are outdated, we can't really be sure. If I were you
> I'd just wait what they say, I related the patch to those issues as well.
>
> Have fun
> Levi
>
>
> On 2012.02.19. 16:01, Luca Pireddu wrote:
>> Hi Levente.  I don't have a newer version of Redmine installed to test
>> your patch, but I've gone ahead and merged it anyways.  I trust you've
>> tested it and can confirm it works properly.  If you can confirm that
>> your modifications resolved the two bugs you marked as related
>> (#788154 and #805863) I'll mark them as fixed as well.
>>
>> Thanks for the patch!
>>
>> Luca
>>
>> On 19 February 2012 14:51, Luca Pireddu<email address hidden>  wrote:
>>> The proposal to merge lp:~tamisoft/redminelocalavatars/redmine-1.4 into lp:redminelocalavatars has been updated.
>>>
>>>     Status: Needs review =>  Merged
>>>
>>> For more details, see:
>>> https://code.launchpad.net/~tamisoft/redminelocalavatars/redmine-1.4/+merge/93681
>>> --
>>> https://code.launchpad.net/~tamisoft/redminelocalavatars/redmine-1.4/+merge/93681
>>> You are requested to review the proposed merge of lp:~tamisoft/redminelocalavatars/redmine-1.4 into lp:redminelocalavatars.
>
> --
> https://code.launchpad.net/~tamisoft/redminelocalavatars/redmine-1.4/+merge/93681
> You are reviewing the proposed merge of lp:~tamisoft/redminelocalavatars/redmine-1.4 into lp:redminelocalavatars.

=== added file 'config/routes.rb'
--- config/routes.rb	1970-01-01 00:00:00 +0000
+++ config/routes.rb	2012-02-18 08:54:17 +0000
@@ -0,0 +1,7 @@
+ActionController::Routing::Routes.draw do |map|
+    map.connect 'my/avatar', :controller => 'my', :action => 'avatar', :conditions => {:method => [:get, :post]}
+    map.connect 'my/save_avatar/:id', :controller => 'my', :action => 'save_avatar', :id=>/\d+/, :conditions => {:method => [:get, :post]}
+    map.connect 'account/get_avatar/:id', :controller => 'account', :action => 'get_avatar', :id=>/\d+/, :conditions => {:method => [:get, :post]}
+    map.connect 'users/save_avatar/:id', :controller => 'users', :action => 'save_avatar', :id=>/\d+/, :conditions => {:method => [:get, :post]}
+    map.connect 'users/get_avatar/:id', :controller => 'users', :action => 'get_avatar', :id=>/\d+/, :conditions => {:method => [:get, :post]}
+end