changed the user list on doodle creation to users expected to answer …

…the doodle only, those users are not made watcheres automatically anymore. New translation string: label_doodle_should_answer
thegcat · Sep 3, 2010 · 02328b8 · 02328b8
1 parent 0b32bb6
commit 02328b8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/app/controllers/doodles_controller.rb b/app/controllers/doodles_controller.rb
@@ -41,8 +41,8 @@ def destroy
 
   def create
     @doodle.attributes = params[:doodle]
-    @doodle.watcher_user_ids = params[:doodle]['watcher_user_ids']
-    @doodle.should_answer_ids = params[:doodle]['watcher_user_ids']
+    #@doodle.watcher_user_ids = params[:doodle]['watcher_user_ids']
+    @doodle.should_answer_ids = params[:doodle]['should_answer_ids']
     if @doodle.save
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'show', :id => @doodle

diff --git a/app/views/doodles/_form.html.erb b/app/views/doodles/_form.html.erb
@@ -11,9 +11,9 @@
   <p><%= link_to_function l(:label_add_options) do |page|
       page.insert_html :bottom, :options, :partial => 'option'
     end %></p>
-  <p><label><%= l(:label_doodle_watchers) %></label>
+  <p><label><%= l(:label_doodle_should_answer) %></label>
   <% @project.users.sort.each do |user| -%>
-  <label class="floating"><%= check_box_tag 'doodle[watcher_user_ids][]', user.id %> <%=h user %></label>
+  <label class="floating"><%= check_box_tag 'doodle[should_answer_ids][]', user.id %> <%=h user %></label>
   <% end -%>
   </p>
   <% end %>

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -8,7 +8,8 @@ de:
   label_doodle_plural: "Doodles"
   label_add_options: "Optionen hinzufügen"
   label_doodle_watchers: "Beobachter (von diesen Benutzern wird auch eine Antwort erwartet)"
-  field_expiry_date: "Expiration date"
+  label_doodle_should_answer: "Benutzer die dieses Doodle antworten sollten"
+  field_expiry_date: "Enddatum"
   field_option: "Option"
   field_options: "Optionen"
   field_missing_answers: "Ausstehende Antworten"

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -8,6 +8,7 @@ en:
   label_doodle_plural: "Doodles"
   label_add_options: "Add options"
   label_doodle_watchers: "Watchers (those users will also be requested to answer the doodle)"
+  label_doodle_should_answer: "Users that should answer this doodle"
   field_expiry_date: "Expiration date"
   field_option: "Option"
   field_options: "Options"

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -7,6 +7,7 @@ ru:
   label_doodle_plural: "Опросы"
   label_add_options: "Добавить варианты"
   label_doodle_watchers: "Наблюдатели (эти пользователи также получат уведомление о необходимости участия в опросе)"
+  label_doodle_should_answer: "Users that should answer this doodle"
   field_expiry_date: "Активен до"
   field_option: "Вариант"
   field_options: "Варианты"