From 67cb4e78d2c7f89fff3febe4b8cfee42e529e57a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 8 Nov 2012 14:45:58 +0100 Subject: [PATCH] [webui] readd a creator function for requests --- src/webui/app/controllers/request_controller.rb | 2 +- src/webui/app/models/bs_request.rb | 6 ++++++ src/webui/app/views/shared/_requests_small.html.erb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/webui/app/controllers/request_controller.rb b/src/webui/app/controllers/request_controller.rb index 56ad34e8768..673998ed6c1 100644 --- a/src/webui/app/controllers/request_controller.rb +++ b/src/webui/app/controllers/request_controller.rb @@ -121,7 +121,7 @@ def changerequest else target = find_cached(Project, tprj) end - target.add_person(:userid => BsRequest.creator(@req).login, :role => "maintainer") + target.add_person(:userid => @req.creator, :role => "maintainer") target.save end end diff --git a/src/webui/app/models/bs_request.rb b/src/webui/app/models/bs_request.rb index fcd5fa87d31..a1ee2a92774 100644 --- a/src/webui/app/models/bs_request.rb +++ b/src/webui/app/models/bs_request.rb @@ -202,4 +202,10 @@ def reviewer_for_history_item(item) end return reviewer end + + # return the login of the creator - to be obsoleted soon (FIXME2.4) + def creator + details = ApiDetails.find(:request_show, id: self.id) + return details['creator'] + end end diff --git a/src/webui/app/views/shared/_requests_small.html.erb b/src/webui/app/views/shared/_requests_small.html.erb index d6b2a0ee59e..88e6519dc9a 100644 --- a/src/webui/app/views/shared/_requests_small.html.erb +++ b/src/webui/app/views/shared/_requests_small.html.erb @@ -8,7 +8,7 @@ <%= link_to("##{req.value(:id)}", :controller => :request, :action => :show, :id => req.value(:id)) -%> by - <%= render :partial => 'shared/user_with_realname_and_icon', :locals => {:user => BsRequest.creator(req).login, :short => true}%> + <%= render :partial => 'shared/user_with_realname_and_icon', :locals => {:user => req.creator, :short => true}%> (<%= fuzzy_time_string(req.state.value :when) %>)