kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set default project and studio at user settings

Browse Source
This commit is contained in:
Milan
2018-10-14 00:05:04 +02:00
parent a949cea7bd
commit eaaea81ed4
7 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/calcms/uac.pm
View File

@@ -664,6 +664,10 @@ sub get_user_presets {
my $studio_id = $options->{studio_id} || '';
$config->{access}->{write} = 0;
my $user_settings = user_settings::get( $config, { user => $user } );
$project_id = $user_settings->{project_id} if $project_id eq '';
$studio_id = $user_settings->{studio_id} if $studio_id eq '';
#get
my $admin_roles = get_admin_user_roles( $config, { user => $user } );
@@ -688,8 +692,6 @@ sub get_user_presets {
$project_id = $projects->[0]->{project_id};
}
#print STDERR "project:$project_id\n";
#check if studios are assigned to project
my $studios = project::get_studios( $config, { project_id => $project_id } );
$error = "no studio is assigned to project" if scalar @$studios == 0;
@@ -709,7 +711,7 @@ sub get_user_presets {
}
$error = "studio is not assigned to user" if ( $studioFound == 0 );
} else {
$studio_id = $studios->[0]->{id};
$studio_id = $studios->[0]->{id} unless defined $studio_id;
}
} else {
@@ -725,7 +727,7 @@ sub get_user_presets {
}
$error = "studio is not assigned to project" if ( $studioFound == 0 );
} else {
$studio_id = $studios->[0]->{id};
$studio_id = $studios->[0]->{id} unless defined $studio_id;
}
}

7
lib/calcms/user_settings.pm
View File

@@ -166,9 +166,6 @@ sub get {
$conditions
};
#print $query."\n";
#print Dumper(\@bind_values);
my $entries = db::get( $dbh, $query, \@bind_values );
return $entries->[0] || undef;
}
@@ -178,7 +175,6 @@ sub insert {
my $entry = shift;
return unless ( defined $entry->{user} );
return unless ( defined $entry->{colors} );
my $dbh = db::connect($config);
return db::insert( $dbh, 'calcms_user_settings', $entry );
}
@@ -188,7 +184,6 @@ sub update {
my $entry = shift;
return unless ( defined $entry->{user} );
return unless ( defined $entry->{colors} );
my $dbh = db::connect($config);
my $values = join( ",", map { $_ . '=?' } ( keys %$entry ) );
@@ -200,6 +195,7 @@ sub update {
set $values
where user=?
};
#print STDERR Dumper($query).Dumper(\@bind_values);
db::put( $dbh, $query, \@bind_values );
print "done\n";
}
@@ -219,7 +215,6 @@ sub delete {
};
my $bind_values = [ $entry->{user} ];
#print '<pre>$query'.$query.Dumper($bind_values).'</pre>';
db::put( $dbh, $query, $bind_values );
}