medvedych/fotostore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Original fn field #5

Merged
alpha6 merged 2 commits from original_fn_field into master 2017-08-02 07:57:10 +03:00
Conversation 0 Commits 2 Files changed 8 +6 -4
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 066ab0197c - Show all commits

3
fotostore.pl
View file

@ -144,6 +144,7 @@ get '/get_images' => ( authenticated => 1 ) => sub {
for my $img_item (@$files_list) { for my $img_item (@$files_list) {
my $file = $img_item->{'file_name'}; my $file = $img_item->{'file_name'};
my $img_hash = {}; my $img_hash = {};
$img_hash->{'filename'} = $img_item->{'original_filename'};
$img_hash->{'original_url'} = File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'}, $ORIG_DIR, $file ); $img_hash->{'original_url'} = File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'}, $ORIG_DIR, $file );
$img_hash->{'thumbnail_url'} = File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'}, $thumbs_size, $file ); $img_hash->{'thumbnail_url'} = File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'}, $thumbs_size, $file );
@ -233,7 +234,7 @@ post '/upload' => ( authenticated => 1 ) => sub {
or die $scaled->errstr; or die $scaled->errstr;
} }
if ( !$db->add_file( $user->{'user_id'}, $filename ) ) { if ( !$db->add_file( $user->{'user_id'}, $filename, $image->filename) ) {
#TODO: Send error msg #TODO: Send error msg
} }

4
lib/FotoStore/DB.pm
View file

@ -51,8 +51,8 @@ sub add_user($self, $username, $password, $fullname) {
} }
sub add_file($self, $user_id, $filename) { sub add_file($self, $user_id, $filename, $original_filename) {
my $rows = $self->{'dbh'}->do(q~insert into images (owner_id, file_name) values (?, ?)~, undef, ($user_id, $filename)); my $rows = $self->{'dbh'}->do(q~insert into images (owner_id, file_name, original_filename) values (?, ?, ?)~, undef, ($user_id, $filename, $original_filename));
if ($self->{'dbh'}->errstr) { if ($self->{'dbh'}->errstr) {
die $self->{'dbh'}->errstr; die $self->{'dbh'}->errstr;
} }

3
templates/includes/images_list.html.ep
View file

@ -38,7 +38,8 @@
<div id="images_list"> <div id="images_list">
<div class="foto-block row" v-for="image in imagesList"> <div class="foto-block row" v-for="image in imagesList">
<div class="image col-md-3"> <div class="image col-md-3">
<img v-bind:src="image.thumbnail_url"> <img v-bind:src="image.thumbnail_url">
<div class="image_title">{{ image.filename }}</div>
</div> </div>
<div class="foto-notes col-md-3"> <div class="foto-notes col-md-3">
<ul> <ul>