yalook
* totem-banner.png: * totem-banner.xs.jpg: * totem-banner.xxs.jpg: totem custo * Makefile: reloads config after each rsync call * NpgsqlBlogProvider.cs: - Fixes access on bills - Fixes usage of bill without photo * style.css: yastyle * AccountController.cs: - Fixes route usage with n ovalue for `id` - better code at getting the avatar url * BlogsController.cs: Fixes a Post request without user name in the route * YavscHelpers.cs: Implements a file list html rendering * App.master: * UserPost.aspx: * Profile.aspx: * AssemblyInfo.aspx: yahtmlstructure * Edit.aspx: Displays a list a attached files * UserPosts.aspx: yahtmlstrucure * Web.csproj: new images * instdbws.sql: returns to the flat list of properies (groups are not working) * LocalizedText.resx: * LocalizedText.fr.resx: * LocalizedText.Designer.cs: * LocalizedText.fr.Designer.cs: a new translation
This commit is contained in:
parent
c79921ea58
commit
30cebd7751
25 changed files with 349 additions and 165 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2015-10-09 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* NpgsqlBlogProvider.cs: - Fixes access on bills
|
||||
- Fixes usage of bill without photo
|
||||
|
||||
2015-10-08 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* NpgsqlBlogProvider.cs: Fixes last commit in case of DBNull
|
||||
|
|
|
|||
|
|
@ -250,13 +250,16 @@ namespace Npgsql.Web.Blog
|
|||
be.Modified = rdr.GetDateTime (rdr.GetOrdinal ("modified"));
|
||||
be.Posted = rdr.GetDateTime (rdr.GetOrdinal ("posted"));
|
||||
be.Visible = rdr.GetBoolean (rdr.GetOrdinal ("visible"));
|
||||
be.Photo = rdr.GetString (rdr.GetOrdinal ("photo"));
|
||||
int oph = rdr.GetOrdinal ("photo");
|
||||
if (!rdr.IsDBNull(oph))
|
||||
be.Photo = rdr.GetString (oph);
|
||||
be.Id = postid;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (be!=null) SetCirclesOn (be);
|
||||
return be;
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// Removes the comment.
|
||||
|
|
@ -459,16 +462,16 @@ namespace Npgsql.Web.Blog
|
|||
using (NpgsqlConnection cnx=new NpgsqlConnection(connectionString))
|
||||
using (NpgsqlCommand cmd = cnx.CreateCommand()) {
|
||||
if (readersName != null) {
|
||||
cmd.CommandText = "select _id, title,bcontent,modified," +
|
||||
cmd.CommandText = "select _id, title,bcontent, modified," +
|
||||
"posted,username,visible " +
|
||||
"from blog b left outer join " +
|
||||
"(select count(*)>0 acc, a.post_id pid " +
|
||||
"from blog_access a," +
|
||||
" circle_members m, users u where m.circle_id = a.circle_id " +
|
||||
" and m.member = u.pkid and u.username = :uname " +
|
||||
" and m.member = u.username and u.username = :uname " +
|
||||
" and u.applicationname = :appname " +
|
||||
" group by a.post_id) ma on (ma.pid = b._id) " +
|
||||
"where ( ma.acc IS NULL or ma.acc = TRUE or b.username = :uname) ";
|
||||
"where ( ((ma.acc IS NULL or ma.acc = TRUE) and b.Visible IS TRUE ) or b.username = :uname) ";
|
||||
cmd.Parameters.AddWithValue ("uname", readersName);
|
||||
} else {
|
||||
cmd.CommandText = "select _id, title,bcontent,modified," +
|
||||
|
|
@ -478,7 +481,8 @@ namespace Npgsql.Web.Blog
|
|||
"from blog_access a" +
|
||||
" group by a.post_id) ma on (ma.pid = b._id)" +
|
||||
" where " +
|
||||
" ma.acc IS NULL and " +
|
||||
" ma.acc IS NULL and " +
|
||||
" b.Visible IS TRUE and " +
|
||||
" applicationname = :appname";
|
||||
}
|
||||
cmd.Parameters.AddWithValue ("@appname", applicationName);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue