bugfix wiki page order on document => now it is fully working

vvmruder · Sep 15, 2016 · be24978 · be24978
1 parent 4fd0bfc
commit be24978
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/app/controllers/doc_pu_wiki_controller.rb b/app/controllers/doc_pu_wiki_controller.rb
@@ -45,17 +45,21 @@ def edit
 
 	# Edit page order
 	def edit_order
-		ordered_wikis = @doc_pu.doc_pu_wiki_pages.all
+		ordered_wikis = @doc_pu.doc_pu_wiki_pages.all.order(wiki_page_order: :asc).to_a
 		wiki = DocPuWikiPage.find(params[:id])
 		move_to = params[:doc_pu_wiki][:move_to]
 		ordered_wikis.delete(wiki)
+    # $latex_logger.error(move_to)
+    # $latex_logger.error(ordered_wikis)
 		case move_to
 			when 'highest' then ordered_wikis.insert(0, wiki)
 			when 'lowest' then ordered_wikis.insert(-1, wiki)
 			when 'higher' then ordered_wikis.insert(wiki.wiki_page_order - 1, wiki)
 			when 'lower' then ordered_wikis.insert(wiki.wiki_page_order + 1, wiki)
-		end
+    end
+    # $latex_logger.error(ordered_wikis)
 		reorder_pages(ordered_wikis)
+    # $latex_logger.error(ordered_wikis)
 		redirect_to :controller => :doc_pu, :action => :edit, :project_id => @project, :id => @doc_pu
 	end
 
@@ -83,7 +87,8 @@ def reorder_pages(ordered_pages)
 				page.wiki_page_order = idx
 				page.save
 				idx += 1
-			end
+      end
+      $latex_logger.error(page)
 		end
 	end
 

diff --git a/app/models/doc_pu_document.rb b/app/models/doc_pu_document.rb
@@ -29,7 +29,7 @@ def build(filename = nil)
 
 	# Get wiki pages
 	def wiki_pages
-		self.doc_pu_wiki_pages.all
+		self.doc_pu_wiki_pages.all.order(wiki_page_order: :asc)
 	end
 
 	def get_flags_from_str

diff --git a/app/views/doc_pu_wiki/_list.html.erb b/app/views/doc_pu_wiki/_list.html.erb
@@ -8,7 +8,7 @@
 		</tr></thead>
 
 		<tbody>
-			<% @doc_pu_wikis.all.each do |page| %> 
+			<% @doc_pu_wikis.all.order(wiki_page_order: :asc).each do |page| %>
 				<tr class="<%= cycle('odd', 'even') %>">
 					<td><%= link_to page.wiki_page.title, {:controller => :doc_pu_wiki, :action => :edit, :project_id => @project, :doc_pu_id => @doc, :id => page} %></td>
 					<td><%= page.chapter_name %></td>