From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qntdd-0002tu-JE for garchives@archives.gentoo.org; Mon, 01 Aug 2011 14:38:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BB7221C19F; Mon, 1 Aug 2011 14:38:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5073E21C19F for ; Mon, 1 Aug 2011 14:38:18 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA3672AC011 for ; Mon, 1 Aug 2011 14:38:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0C25A45EF5 for ; Mon, 1 Aug 2011 14:38:16 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: <6c58eb40efb9f6eedc2f9d31b3ecf00780c25ad5.betelgeuse@gentoo> Subject: [gentoo-commits] proj/council-webapp:master commit in: site/app/models/ X-VCS-Repository: proj/council-webapp X-VCS-Files: site/app/models/agenda.rb site/app/models/agenda_item.rb X-VCS-Directories: site/app/models/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 6c58eb40efb9f6eedc2f9d31b3ecf00780c25ad5 Date: Mon, 1 Aug 2011 14:38:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 6a259a43c9a3ec437bab50faabfe607d commit: 6c58eb40efb9f6eedc2f9d31b3ecf00780c25ad5 Author: Joachim Filip Ignacy Bartosik gmail com= > AuthorDate: Tue Jul 26 14:49:48 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Jul 26 15:06:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/council-webap= p.git;a=3Dcommit;h=3D6c58eb40 Cleanup Agenda.update_voting_options --- site/app/models/agenda.rb | 13 +------------ site/app/models/agenda_item.rb | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/site/app/models/agenda.rb b/site/app/models/agenda.rb index 75a9a23..29c57f5 100644 --- a/site/app/models/agenda.rb +++ b/site/app/models/agenda.rb @@ -78,18 +78,7 @@ class Agenda < ActiveRecord::Base agenda =3D Agenda.current options.each do |item_info| item =3D AgendaItem.first :conditions =3D> { :agenda_id =3D> agend= a, :title =3D> item_info.first } - new_descriptions =3D item_info[1] - old_descriptions =3D item.voting_options.*.description - - (old_descriptions - new_descriptions).each do |description| - option =3D VotingOption.first :conditions =3D> { :agenda_item_id= =3D> item.id, - :description =3D> = description } - option.destroy - end - - (new_descriptions - old_descriptions ).each do |description| - VotingOption.create! :agenda_item =3D> item, :description =3D> d= escription - end + item.update_voting_options(item_info[1]) end end =20 diff --git a/site/app/models/agenda_item.rb b/site/app/models/agenda_item= .rb index 938e2e1..e8874ff 100644 --- a/site/app/models/agenda_item.rb +++ b/site/app/models/agenda_item.rb @@ -56,6 +56,18 @@ class AgendaItem < ActiveRecord::Base return acting_user =3D=3D user if [nil, :title, :discussion, :body].= include?(field) end =20 + def update_voting_options(new_descriptions) + old_descriptions =3D voting_options.*.description + + (old_descriptions - new_descriptions).each do |description| + option =3D VotingOption.agenda_item_id_is(id).description_is(descr= iption).first + option.destroy + end + + (new_descriptions - old_descriptions ).each do |description| + VotingOption.create! :agenda_item =3D> self, :description =3D> des= cription + end + end protected # Updated discussion time for a single agenda item # protected because we want to call it only from