Merge branch 'master' of github.com:concerto/concerto

concerto · May 3, 2012 · 0c39f96 · 0c39f96
2 parents 7d6e482 + 7a92d05
commit 0c39f96
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
@@ -6,7 +6,7 @@ def index
     @this_feed = Feed.find(params[:feed_id])
     @sub_feeds = @this_feed.children
     @submissions = Submission.where(:feed_id => params[:feed_id])
-    
+
     respond_to do |format|
       format.js { }
       format.html { }
@@ -15,7 +15,7 @@ def index
 
   def show
     @submission = Submission.find(params[:id])
-    
+
     respond_to do |format|
       format.js { }
       format.html { }
@@ -26,19 +26,19 @@ def show
   def approve
     submission = Submission.find(params[:id])
     respond_to do |format|
-      if submission.approve(User.find(params[:user_id]), params[:submission][:duration])
+      if submission.approve(current_user, params[:submission][:duration])
         format.html { redirect_to(feed_submissions_path, :notice => t(:content_approved)) }
       else
         format.html { redirect_to(feed_submission_path, :notice => t(:content_failed_approve)) }
       end
     end
   end
-  
+
   # PUT /feeds/1/submission/1/deny
   def deny
     submission = Submission.find(params[:id])
     respond_to do |format|
-      if submission.deny(User.find(params[:user_id]))
+      if submission.deny(current_user)
         format.html { redirect_to(feed_submissions_path, :notice => t(:content_denied)) }
       else
         logger.debug submission.errors

diff --git a/app/views/submissions/_approve_form.html.erb b/app/views/submissions/_approve_form.html.erb
@@ -1,10 +1,4 @@
 <%= form_for([submission.feed, submission], :url => approve_feed_submission_path(submission.feed, submission)) do |f| %>
-  <div class="clearfix">
-    <%= f.label :user_id, "Moderator" %>
-    <div class="input">
-      <%= select_tag "user_id", options_from_collection_for_select(User.all, "id", "name"), :class => "span3" %>
-    </div>
-  </div>
   <div class="clearfix">
     <%= f.label :duration %>
     <div class="input">

diff --git a/app/views/submissions/_deny_form.html.erb b/app/views/submissions/_deny_form.html.erb
@@ -1,9 +1,3 @@
 <%= form_for([submission.feed, submission], :url => deny_feed_submission_path(submission.feed, @submission)) do |f| %>
-  <div class="clearfix">
-    <%= f.label :user_id, "Moderator" %>
-    <div class="input">
-      <%= select_tag "user_id", options_from_collection_for_select(User.all, "id", "name"), :class => "span3" %>
-    </div>
-  </div>
   <%= f.submit "Moderate Content", :class => "btn primary" %>
 <% end %>