Fix archieve display repeated problem.
This commit is contained in:
		
							parent
							
								
									aebc498144
								
							
						
					
					
						commit
						79e0b5b0ba
					
				| 
						 | 
				
			
			@ -340,8 +340,8 @@ F		cats = files_by_cateogry.keys.collect do |cat|
 | 
			
		|||
	end
 | 
			
		||||
	private
 | 
			
		||||
	    def get_sorted_cat_with_filter(categories,cat_type)
 | 
			
		||||
	        all_categories_with_nil = ArchiveCategory.all.in(sort_number: nil)
 | 
			
		||||
            all_categories_no_nil = ArchiveCategory.all.not_in(sort_number: nil).order_by(sort_number: 'desc')
 | 
			
		||||
	        all_categories_with_nil = ArchiveCategory.all.in(sort_number: nil).uniq!{|c| c.category_id }.to_a rescue []
 | 
			
		||||
            all_categories_no_nil = ArchiveCategory.all.not_in(sort_number: nil).order_by(sort_number: 'desc').uniq!{|c| c.category_id }.to_a rescue []
 | 
			
		||||
            all_categories_id = all_categories_no_nil.concat(all_categories_with_nil).collect do |cat|
 | 
			
		||||
                cat.category_id.to_s
 | 
			
		||||
            end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue