ordering added to albums

app/controllers/admin/galleries_controller.rb

@@ -4,7 +4,7 @@ class Admin::GalleriesController < OrbitAdminController
   before_action :log_user_action
   layout "back_end"
   def index
-    @albums = Album.all
+    @albums = Album.all.asc(:order)
      @tags = @module_app.tags
   end
 

app/controllers/admin/images_controller.rb

@@ -8,12 +8,24 @@ class Admin::ImagesController < OrbitAdminController
 	end
 
 	def changeorder
-		images = params[:imageids]
-		images.each_with_index do |image, i|
-			img = AlbumImage.find(image) rescue nil
-			if !img.nil?
-				img.order = i
-				img.save 
+		type = params[:type]
+		if type == "imgholder"
+			images = params[:imageids]
+			images.each_with_index do |image, i|
+				img = AlbumImage.find(image) rescue nil
+				if !img.nil?
+					img.order = i
+					img.save 
+				end
+			end
+		elsif type == "orbit_gallery"
+			albums = params[:imageids]
+			albums.each_with_index do |albumid, i|
+				album = Album.find(albumid) rescue nil
+				if !album.nil?
+					album.order = i
+					album.save 
+				end
 			end
 		end
     	render :json => {"success" => true}.to_json

app/controllers/galleries_controller.rb

@@ -1,6 +1,6 @@
 class GalleriesController < ApplicationController
 	def index
-      albums = Album.filter_by_categories
+      albums = Album.filter_by_categories.asc(:order)
       galleries = albums.collect do |a|
       {
         "album-name" => a.name,