diff --git a/src/myWebLog.Data/Entities.fs b/src/myWebLog.Data/Entities.fs index 60cfde2..1d10d1b 100644 --- a/src/myWebLog.Data/Entities.fs +++ b/src/myWebLog.Data/Entities.fs @@ -58,6 +58,7 @@ with /// A page with static content type Page = { /// The Id + [] Id : string /// The Id of the web log to which this page belongs WebLogId : string @@ -100,6 +101,7 @@ type PageListEntry = /// A web log type WebLog = { /// The Id + [] Id : string /// The name Name : string @@ -139,6 +141,7 @@ type Authorization = /// A user of myWebLog type User = { /// The Id + [] Id : string /// The user name (e-mail address) UserName : string @@ -175,6 +178,7 @@ with /// A category to which posts may be assigned type Category = { /// The Id + [] Id : string /// The Id of the web log to which this category belongs WebLogId : string @@ -203,6 +207,7 @@ with /// A comment (applies to a post) type Comment = { /// The Id + [] Id : string /// The Id of the post to which this comment applies PostId : string @@ -236,6 +241,7 @@ with /// A post type Post = { /// The Id + [] Id : string /// The Id of the web log to which this post belongs WebLogId : string diff --git a/src/myWebLog.Data/WebLog.fs b/src/myWebLog.Data/WebLog.fs index e2f77d5..d616a8d 100644 --- a/src/myWebLog.Data/WebLog.fs +++ b/src/myWebLog.Data/WebLog.fs @@ -18,7 +18,7 @@ type DashboardCounts = /// Detemine the web log by the URL base let tryFindWebLogByUrlBase conn (urlBase : string) = r.Table(Table.WebLog) - .GetAll(urlBase).OptArg("index", "urlBase") + .GetAll(urlBase).OptArg("index", "UrlBase") .Merge(fun w -> r.HashMap("PageList", r.Table(Table.Page) .GetAll(w.["Id"]).OptArg("index", "WebLogId") .Filter(ReqlFunction1(fun pg -> upcast pg.["ShowInPageList"].Eq(true))) diff --git a/src/myWebLog.Web/App.fs b/src/myWebLog.Web/App.fs index 0e1fc37..3c137a2 100644 --- a/src/myWebLog.Web/App.fs +++ b/src/myWebLog.Web/App.fs @@ -117,9 +117,7 @@ type MyWebLogBootstrapper() = let version = let v = Reflection.Assembly.GetExecutingAssembly().GetName().Version match v.Build with - | 0 -> match v.Minor with - | 0 -> string v.Major - | _ -> sprintf "%d.%d" v.Major v.Minor + | 0 -> match v.Minor with 0 -> string v.Major | _ -> sprintf "%d.%d" v.Major v.Minor | _ -> sprintf "%d.%d.%d" v.Major v.Minor v.Build |> sprintf "v%s" diff --git a/src/myWebLog.Web/ViewModels.fs b/src/myWebLog.Web/ViewModels.fs index 75f8f3e..4c13656 100644 --- a/src/myWebLog.Web/ViewModels.fs +++ b/src/myWebLog.Web/ViewModels.fs @@ -197,7 +197,7 @@ type CategoryListModel(ctx, webLog, categories) = /// Form for editing a category type CategoryForm(category : Category) = - new() = CategoryForm(Category.empty) + new() = CategoryForm(Category.Empty) /// The name of the category member val Name = category.Name with get, set /// The slug of the category (used in category URLs) diff --git a/src/myWebLog.Web/myWebLog.Web.fsproj b/src/myWebLog.Web/myWebLog.Web.fsproj index 59c8dfa..66bdbba 100644 --- a/src/myWebLog.Web/myWebLog.Web.fsproj +++ b/src/myWebLog.Web/myWebLog.Web.fsproj @@ -22,7 +22,7 @@ bin\Debug\ DEBUG;TRACE 3 - bin\Debug\myWebLog.Web.xml + bin\Debug\MyWebLog.Web.xml pdbonly @@ -126,11 +126,11 @@ True - ..\packages\Nancy.Session.Persistable.0.8.6\lib\net452\Nancy.Session.Persistable.dll + ..\packages\Nancy.Session.Persistable.0.9.0\lib\net452\Nancy.Session.Persistable.dll True - ..\packages\Nancy.Session.RethinkDB.0.8.6\lib\net452\Nancy.Session.RethinkDb.dll + ..\packages\Nancy.Session.RethinkDB.0.9.0\lib\net452\Nancy.Session.RethinkDb.dll True diff --git a/src/myWebLog.Web/packages.config b/src/myWebLog.Web/packages.config index ec73544..cd8ef6e 100644 --- a/src/myWebLog.Web/packages.config +++ b/src/myWebLog.Web/packages.config @@ -10,8 +10,8 @@ - - + + diff --git a/src/myWebLog/App.config b/src/myWebLog/App.config index 88fa402..16f1295 100644 --- a/src/myWebLog/App.config +++ b/src/myWebLog/App.config @@ -3,4 +3,26 @@ - \ No newline at end of file + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/myWebLog/myWebLog.csproj b/src/myWebLog/myWebLog.csproj index 613f01f..1622845 100644 --- a/src/myWebLog/myWebLog.csproj +++ b/src/myWebLog/myWebLog.csproj @@ -11,7 +11,7 @@ MyWebLog v4.5.2 512 - true + false AnyCPU