diff options
| author |   Joachim Filip Ignacy Bartosik <jbartosik@gmail.com> | 2011-06-13 15:28:53 +0200 |
|---|---|---|
| committer | Joachim Filip Ignacy Bartosik <jbartosik@gmail.com> | 2011-06-17 20:39:41 +0200 |
| commit | a698363f18aa0b38bb2a3989a148543d0fac8b5a (patch) | |
| tree | 48ca1cead452712b1427a2c44886f70832d35a32 /site/app/models/user.rb | |
| parent | Change names to communicative (diff) | |
| download | council-webapp-a698363f18aa0b38bb2a3989a148543d0fac8b5a.tar.gz council-webapp-a698363f18aa0b38bb2a3989a148543d0fac8b5a.tar.bz2 council-webapp-a698363f18aa0b38bb2a3989a148543d0fac8b5a.zip | |
Remove some duplication
Reported by Metrical/Reek. Some reported duplication left (Calls to
ActiveRecord fields, calls to acting_user etc.)
Diffstat (limited to 'site/app/models/user.rb')
| -rw-r--r-- | site/app/models/user.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/site/app/models/user.rb b/site/app/models/user.rb index 0ca3e33..7809e87 100644 --- a/site/app/models/user.rb +++ b/site/app/models/user.rb @@ -72,10 +72,11 @@ class User < ActiveRecord::Base end def can_appoint_a_proxy?(user) + agenda = Agenda.current return false unless council_member? return false if user.council_member? - return false unless Proxy.council_member_is(self).agenda_is(Agenda.current).count == 0 - return false unless Proxy.proxy_is(user).agenda_is(Agenda.current).count == 0 + return false unless Proxy.council_member_is(self).agenda_is(agenda).count == 0 + return false unless Proxy.proxy_is(user).agenda_is(agenda).count == 0 true end end |