andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

bugfix multiple lines

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-22 13:49:11 +02:00
parent 60d86d9cb1
commit cbe536a56b
3 changed files with 80 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/fotos_controller.rb
View File

@@ -46,7 +46,7 @@ class FotosController < ApplicationController
@foto.gallery_id = (params[:gallery_id]) @foto.gallery_id = (params[:gallery_id])
@gallery = @foto.gallery @gallery = @foto.gallery
respond_to do |format| respond_to do |format|
@foto.title = @foto.datei @foto.title = @foto.datei.filename
if @foto.save if @foto.save
format.html { format.html {
render :json => [@foto.to_jq_upload].to_json, render :json => [@foto.to_jq_upload].to_json,

2
app/models/foto.rb
View File

@@ -8,7 +8,7 @@ class Foto < ActiveRecord::Base
"id" => read_attribute(:id), "id" => read_attribute(:id),
"title" => read_attribute(:title), "title" => read_attribute(:title),
"description" => read_attribute(:desc), "description" => read_attribute(:desc),
"name" => read_attribute(:datei), "name" => read_attribute(:title),
"size" => datei.size, "size" => datei.size,
"url" => datei.url, "url" => datei.url,
"thumbnail_url" => datei.thumb.url, "thumbnail_url" => datei.thumb.url,

5
app/views/fotos/_form_bulk.html.erb
View File

@@ -124,8 +124,9 @@
template; template;
fu._adjustMaxNumberOfFiles(-files.length); fu._adjustMaxNumberOfFiles(-files.length);
console.log(files); console.log(files);
template = fu._renderDownload(files) // no Download on Upload form
.appendTo($('#fileupload .files')); //template = fu._renderDownload(files)
//.appendTo($('#fileupload .files'));
// Force reflow: // Force reflow:
fu._reflow = fu._transition && template.length && fu._reflow = fu._transition && template.length &&
template[0].offsetWidth; template[0].offsetWidth;