diff --git a/app/controllers/fotos_controller.rb b/app/controllers/fotos_controller.rb index b97f105..b0f0e76 100644 --- a/app/controllers/fotos_controller.rb +++ b/app/controllers/fotos_controller.rb @@ -1,5 +1,6 @@ class FotosController < ApplicationController before_filter {@toolbar_elements=[]} + load_and_authorize_resource # GET /fotos # GET /fotos.json def index @@ -17,7 +18,13 @@ class FotosController < ApplicationController @foto = Foto.find(params[:id]) respond_to do |format| - format.html # show.html.erb + format.html { + if params[:plain] + render "show", layout: false + else + redirect_to gallery_path(@foto.gallery,:params=>{fotoid: @foto.id}) + end + } format.json { render json: @foto } end end diff --git a/app/controllers/galleries_controller.rb b/app/controllers/galleries_controller.rb index 978f200..7a047ca 100644 --- a/app/controllers/galleries_controller.rb +++ b/app/controllers/galleries_controller.rb @@ -27,9 +27,18 @@ class GalleriesController < ApplicationController end @page = params[:page].nil? ? 1 : params[:page].to_i + + # @fotos = Foto.where(:gallery_id => params[:id]).limit(@pppage_array[@pppage]).offset(@pppage_array[@pppage]*(@page-1)) @fotos = Foto.where(:gallery_id => params[:id]) - if @fotos.nil? || @fotos.empty? + unless params[:fotoid].nil? + foto_ind = @fotos.find_index(Foto.find(params[:fotoid])) + # @page=(@fotos.count/foto_ind).to_i+1 + @openfotoid=params[:fotoid] + else +@openfotoid=0 + end + if @fotos.nil? || @fotos.empty? @fotos_p = [] @fotos_n = [] @pages = 1 diff --git a/app/models/ability.rb b/app/models/ability.rb index e00018d..8d8e51b 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -63,6 +63,7 @@ class Ability end if( user.has_role?("fetuser") || user.has_role?("fetadmin")) can :manage, Gallery + can :show, Foto end unless user.has_role?("fetadmin") cannot :delete, Gallery diff --git a/app/views/fotos/show.html.erb b/app/views/fotos/show.html.erb index 9183e5e..c33d0d4 100644 --- a/app/views/fotos/show.html.erb +++ b/app/views/fotos/show.html.erb @@ -1,31 +1,14 @@ -
<%= @foto.desc %>
-- <%= link_to 'last' , gallery_foto_path(@foto.gallery, @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)-1].try(:id).to_i) unless @foto.gallery.fotos.index(@foto)==0 %> - <%= link_to 'next' , gallery_foto_path(@foto.gallery, @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].try(:id).to_i) unless @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].nil? %> - <%= link_to 'Edit', edit_foto_path(@foto) %> | - <%= link_to 'Back', gallery_path(@foto.gallery) %> -
-<%= notice %>
<%= notice %>
+ +
<%= @gallery.desc %>
- - +