closes concerto#1519 ordering content per feed

Author: mfrederickson

app/assets/javascripts/submissions.js

@@ -77,9 +77,9 @@ $(document).on('page:change', initBrowse);
 
 
 function initReorderSubmissions() {
+  var feedId = $('.submissions-active').data('feed-id');
   $('.submissions-active .tile').on('dragstart', function(ev) {
     var submissionId = ev.target.closest('.tile').dataset.submissionId;
-    // console.debug('set data', submissionId);
     ev.originalEvent.dataTransfer.setData('text/plain/id', submissionId);
     ev.originalEvent.dataTransfer.dropEffect = 'move';
   }).on('dragover', function (ev) {
@@ -91,14 +91,14 @@ function initReorderSubmissions() {
     if (fromId) {
       var beforeId = ev.target.closest('.tile').dataset.submissionId;
       if (fromId !== beforeId) {
-        // console.debug('dropped', fromId, 'on', beforeId);
-        // TODO! need to make this happen on the backend and then reflect the move here
-        // but make sure that they are allowed to.
-        $('.tile[data-submission-id=' + beforeId + ']').before($('.tile[data-submission-id=' + fromId + ']'));
+        $.get('/feeds/' + feedId + '/submissions/' + fromId + '/reorder?before=' + beforeId)
+          .done(function(data) {
+            $('.tile[data-submission-id=' + beforeId + ']').before($('.tile[data-submission-id=' + fromId + ']'));
+          });
       }
     }
   });
 }
 
-$(document).ready(initReorderSubmissions);
+//$(document).ready(initReorderSubmissions);
 $(document).on('page:change', initReorderSubmissions);

app/controllers/submissions_controller.rb

@@ -17,15 +17,15 @@ def index
     @submissions = []
     case state
     when 'expired'
-      @submissions = @feed.submissions.approved.expired
+      @submissions = @feed.submissions.approved.expired.reorder('contents.end_time desc')
     when 'future'
-      @submissions = @feed.submissions.approved.future
+      @submissions = @feed.submissions.approved.future.reorder('contents.start_time')
     when 'pending'
-      @submissions = @feed.submissions.pending
+      @submissions = @feed.submissions.pending.reorder('contents.start_time')
     when 'denied'
-      @submissions = @feed.submissions.denied
+      @submissions = @feed.submissions.denied.reorder('submissions.updated_at desc')
     else
-      @submissions = @feed.submissions.approved.active
+      @submissions = @feed.submissions.approved.active.reorder('submissions.seq_no, submissions.id')
       state = 'active'
     end
     @submissions = @submissions.includes(:content)
@@ -49,6 +49,53 @@ def index
     end
   end
 
+  # GET /feeds/:feed_id/submissions/1/reorder?before=
+  # GET /feeds/:feed_id/submissions/1/reorder?before=.js
+  def reorder
+    @submission = Submission.find(params[:id])
+    if cannot?(:moderate, @feed)
+      head :forbidden
+    else
+      @before = Submission.find(params[:before])
+      if @submission.blank? || @before.blank?
+        head :not_found
+      else
+        @submissions = @feed.submissions.approved.active.reorder('submissions.seq_no, contents.start_time')
+        seq_no = 0
+        reserved_slot = 0
+        parent_seq_nos = {}
+        @submissions.each do |s|
+          # child content also has a submission record, and its seq_no should match it's parent, so skip the children here
+          next if s.content.parent.present?
+
+          seq_no = seq_no + 1
+          if s.id == @before.id
+            reserved_slot = seq_no
+            seq_no = seq_no + 1
+            s.seq_no = seq_no
+          elsif s.id == @submission.id
+            s.seq_no = reserved_slot
+          else
+            s.seq_no = seq_no
+          end
+          s.save
+
+          # keep track of each parent's seq_no so we can set their children
+          if s.content.children_count > 0
+            parent_seq_nos[s.content.id] = s.seq_no
+          end
+        end
+        @submissions.each do |s|
+          next if s.content.parent.blank?
+          s.seq_no = parent_seq_nos[s.content.parent.id]
+          s.save
+        end
+
+        head :ok
+      end
+    end
+  end
+
   # GET /feeds/:feed_id/submissions/1
   # GET /feeds/:feed_id/submissions/1.js
   def show

app/controllers/users_controller.rb

@@ -18,7 +18,7 @@ def show
     @memberships = @user.memberships.joins(:group).order('groups.name')
     auth!({action: :read, object: @memberships})
 
-    @contents = @user.contents.where('parent_id IS NULL')
+    @contents = @user.contents.where('parent_id IS NULL').reorder('start_time desc')
     @contents_count = @contents.count
     @contents = Kaminari.paginate_array(@contents).page(params[:page])
     auth!({action: :read, object: @contents})

app/models/subscription.rb

@@ -37,7 +37,7 @@ def weight_name
 
   # Get an array of all the approved active content to be shown in a screen's field.
   def contents
-    @contents = self.feed.approved_contents.active.all.to_a
+    @contents = self.feed.approved_contents.active.all.reorder('submissions.seq_no, contents.start_time').to_a
     run_callbacks :filter_contents do
       @contents.reject!{|c| !c.can_display_in?(self.screen, self.field)}
     end

app/views/submissions/_index_body.html.erb

@@ -187,7 +187,7 @@
     </div>
   </div>
   <br />
-  <div class="submissions-<%= @state %>">
+  <div class="submissions-<%= @state %>" data-feed-id="<%= @feed.id %>">
     <% @paginated_submissions.select{|s| @state != 'active' || s.content.parent.nil?}.each do |submission| %>
       <%= render partial: "submissions/submission_tile", locals: { submission: submission } %>
     <% end %>

config/routes.rb

@@ -94,7 +94,11 @@ def matches?(request)
     collection do
       get :moderate
     end
-    resources :submissions, only: [:index, :show, :update]
+    resources :submissions, only: [:index, :show, :update] do
+      member do
+        get :reorder
+      end
+    end
   end
 
   get 'content/search' => 'contents#index'

lib/base_shuffle.rb

@@ -34,6 +34,6 @@ def remove_consecutive(arr)
   private
 
   def content
-    @subscriptions.collect{|s| s.contents.order('submissions.seq_no, submissions.id')}).flatten
+    @subscriptions.collect{|s| s.contents }.flatten
   end
 end