From 2cae8582f819461d4c924c627acf24455bc945f2 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sun, 27 Sep 2015 23:18:28 +0200 Subject: [PATCH] Npqsql upgrade, and Blog post visibility edition * NpgsqlBlogProvider.cs: * NpgsqlCircleProvider.cs: Fixes the sql command preparation * App.master: Circles edition needs also this lib, all pages will need it ... * Edit.aspx: Restores the post visibility control * Web.config: Fixes the new connection string, the `Encoding` parameter is no more supported. * Web.csproj: Nuget packages updating * packages.config: Nuget packages updating --- NpgsqlBlogProvider/ChangeLog | 4 +++ NpgsqlBlogProvider/NpgsqlBlogProvider.cs | 7 ++-- NpgsqlContentProvider/ChangeLog | 4 +++ NpgsqlContentProvider/NpgsqlCircleProvider.cs | 9 +++-- web/ChangeLog | 14 ++++++++ web/Models/App.master | 2 ++ web/Views/Blogs/Edit.aspx | 33 ++++++++++--------- web/Web.config | 2 +- web/Web.csproj | 26 +++++++-------- web/packages.config | 13 ++++---- 10 files changed, 70 insertions(+), 44 deletions(-) diff --git a/NpgsqlBlogProvider/ChangeLog b/NpgsqlBlogProvider/ChangeLog index cc31d06b..a85baef3 100644 --- a/NpgsqlBlogProvider/ChangeLog +++ b/NpgsqlBlogProvider/ChangeLog @@ -1,3 +1,7 @@ +2015-09-27 Paul Schneider + + * NpgsqlBlogProvider.cs: Fixes the sql command preparation + 2015-09-23 Paul Schneider * NpgsqlBlogProvider.cs: refactoring: The `UserName` property diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs index 533bae65..9f237b10 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using Yavsc.Model.Blogs; using Yavsc.Model.Circles; using System.Web.Mvc; +using NpgsqlTypes; namespace Npgsql.Web.Blog { @@ -286,9 +287,9 @@ namespace Npgsql.Web.Blog using (NpgsqlCommand cmd = cnx.CreateCommand ()) { cmd.CommandText = "select _id,bcontent,modified,posted,visible from blog " + "where applicationname = :appname and username = :username and title = :title"; - cmd.Parameters.AddWithValue ("appname", applicationName); - cmd.Parameters.AddWithValue ("username", username); - cmd.Parameters.AddWithValue ("title", title); + cmd.Parameters.AddWithValue ("appname", NpgsqlDbType.Varchar, applicationName); + cmd.Parameters.AddWithValue ("username", NpgsqlDbType.Varchar ,username); + cmd.Parameters.AddWithValue ("title", NpgsqlDbType.Varchar, title); cnx.Open (); cmd.Prepare (); using (NpgsqlDataReader rdr = cmd.ExecuteReader ()) { diff --git a/NpgsqlContentProvider/ChangeLog b/NpgsqlContentProvider/ChangeLog index 49aee005..28adf739 100644 --- a/NpgsqlContentProvider/ChangeLog +++ b/NpgsqlContentProvider/ChangeLog @@ -1,3 +1,7 @@ +2015-09-27 Paul Schneider + + * NpgsqlCircleProvider.cs: Fixes the sql command preparation + 2015-09-10 Paul Schneider * NpgsqlCircleProvider.cs: diff --git a/NpgsqlContentProvider/NpgsqlCircleProvider.cs b/NpgsqlContentProvider/NpgsqlCircleProvider.cs index d763c218..ef297790 100644 --- a/NpgsqlContentProvider/NpgsqlCircleProvider.cs +++ b/NpgsqlContentProvider/NpgsqlCircleProvider.cs @@ -88,7 +88,7 @@ namespace WorkFlowProvider using (NpgsqlCommand cmd = cnx.CreateCommand ()) { cmd.CommandText = "select member from circle_members where circle_id = :cid"; - cmd.Parameters.AddWithValue ("cid", id); + cmd.Parameters.AddWithValue ("cid", NpgsqlTypes.NpgsqlDbType.Bigint, id); cmd.Prepare (); List members = new List (); using (NpgsqlDataReader dr = cmd.ExecuteReader ()) { @@ -178,7 +178,7 @@ namespace WorkFlowProvider using (NpgsqlCommand cmd = cnx.CreateCommand ()) { cmd.CommandText = "select count(*)>0 from circle_members where circle_id = :cid and member = :mbr"; cmd.Parameters.Add ("cid", NpgsqlDbType.Bigint); - cmd.Parameters.AddWithValue ("mbr", member); + cmd.Parameters.AddWithValue ("mbr", NpgsqlDbType.Varchar, member); cnx.Open (); cmd.Prepare (); foreach (long cid in circle_ids) { @@ -256,7 +256,7 @@ namespace WorkFlowProvider } using (NpgsqlCommand cmd = cnx.CreateCommand ()) { cmd.CommandText = "insert into circle_members (circle_id,member) values (@cid,@mbr)"; - cmd.Parameters.AddWithValue ("cid", id); + cmd.Parameters.AddWithValue ("cid", NpgsqlDbType.Varchar , id); cmd.Parameters.Add ("mbr", NpgsqlDbType.Varchar); cmd.Prepare (); if (users != null) @@ -296,9 +296,8 @@ namespace WorkFlowProvider using (NpgsqlConnection cnx = new NpgsqlConnection (connectionString)) { using (NpgsqlCommand cmd = cnx.CreateCommand ()) { cmd.CommandText = "select _id, title from circle where owner = :wnr"; - cmd.Parameters.AddWithValue ("wnr", user); + cmd.Parameters.AddWithValue ("wnr",user); cnx.Open (); - cmd.Prepare (); using (NpgsqlDataReader rdr = cmd.ExecuteReader ()) { if (rdr.HasRows) { while (rdr.Read ()) { diff --git a/web/ChangeLog b/web/ChangeLog index baaec05e..916ca448 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,17 @@ +2015-09-27 Paul Schneider + + * App.master: Circles edition needs also this lib, all pages + will need it ... + + * Edit.aspx: Restores the post visibility control + + * Web.config: Fixes the new connection string, the `Encoding` + parameter is no more supported. + + * Web.csproj: Nuget packages updating + + * packages.config: Nuget packages updating + 2015-09-27 Paul Schneider * jquery.htmlClean.min.js: * in order to paste from any(?) diff --git a/web/Models/App.master b/web/Models/App.master index 64bf7d5b..3c463e3a 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -12,6 +12,8 @@ " /> + + diff --git a/web/Views/Blogs/Edit.aspx b/web/Views/Blogs/Edit.aspx index e9eacec8..4e61b8cf 100644 --- a/web/Views/Blogs/Edit.aspx +++ b/web/Views/Blogs/Edit.aspx @@ -1,10 +1,9 @@ <%@ Page Title="Bill_edition" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> <%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %> - - - -" /> + + + @@ -25,6 +24,18 @@ <%= Html.LabelFor(model => model.Content) %> <%= Html.ValidationMessage("Content") %>:

+ +<%= Html.CheckBox( "Visible" ) %> +<%= Html.LabelFor(model => model.Visible) %> + +<%= Html.ValidationMessage("Visible", "*") %> +
+ +<%= Html.LabelFor(model => model.AllowedCircles) %> +<%= Html.ListBox("AllowedCircles") %> + +<%= Html.ValidationMessage("AllowedCircles", "*") %> + <%=Html.Hidden("Author")%> <%=Html.Hidden("Id")%> @@ -145,17 +156,10 @@ function submitFilesTo(method) } function submitImport() -{ - submitFilesTo('Import'); -} +{ submitFilesTo('Import'); } function submitFile() -{ - submitFilesTo('PostFile'); -} - - - +{ submitFilesTo('PostFile'); }
@@ -171,6 +175,3 @@ function submitFile() - - - diff --git a/web/Web.config b/web/Web.config index 0706f873..70716a46 100644 --- a/web/Web.config +++ b/web/Web.config @@ -251,7 +251,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - + diff --git a/web/Web.csproj b/web/Web.csproj index 14da2006..775c4ff1 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -81,29 +81,29 @@ ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\Npgsql.2.2.5\lib\net45\Mono.Security.dll - - - ..\packages\Npgsql.2.2.5\lib\net45\Npgsql.dll - ..\packages\PayPalButtonManagerSDK.2.9.109\lib\net20\PayPalButtonManagerSDK.dll ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll + + lib\MarkdownDeep.dll - ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll + ..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll + + + ..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll + + + ..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll - ..\packages\PayPalCoreSDK.1.6.2\lib\net451\PayPalCoreSDK.dll + ..\packages\PayPalCoreSDK.1.6.3\lib\net451\PayPalCoreSDK.dll - - lib\MarkdownDeep.dll + + ..\packages\Npgsql.3.0.3\lib\net45\Npgsql.dll @@ -381,7 +381,7 @@ - + diff --git a/web/packages.config b/web/packages.config index 76c1f0a7..1540d225 100644 --- a/web/packages.config +++ b/web/packages.config @@ -7,12 +7,13 @@ - + - - + + - - - + + + + \ No newline at end of file