diff --git a/web/Views/Admin/CreateBackup.aspx b/web/Views/Admin/CreateBackup.aspx index 6a9397fd..a75849ba 100644 --- a/web/Views/Admin/CreateBackup.aspx +++ b/web/Views/Admin/CreateBackup.aspx @@ -9,12 +9,12 @@ <%= Html.LabelFor(model => model.Port) %>: <%= Html.TextBox( "Port" ) %> <%= Html.ValidationMessage("Port", "*") %>
-<%= Html.LabelFor(model => model.Dbname) %>: -<%= Html.TextBox( "Dbname" ) %> -<%= Html.ValidationMessage("Dbname", "*") %>
-<%= Html.LabelFor(model => model.Dbuser) %>: -<%= Html.TextBox( "Dbuser" ) %> -<%= Html.ValidationMessage("Dbuser", "*") %>
+<%= Html.LabelFor(model => model.DbName) %>: +<%= Html.TextBox( "DbName" ) %> +<%= Html.ValidationMessage("DbName", "*") %>
+<%= Html.LabelFor(model => model.DbUser) %>: +<%= Html.TextBox( "DbUser" ) %> +<%= Html.ValidationMessage("DbUser", "*") %>
<%= Html.LabelFor(model => model.Password) %>: <%= Html.Password( "Password" ) %> <%= Html.ValidationMessage("Password", "*") %>
diff --git a/web/Views/Admin/Created.aspx b/web/Views/Admin/Created.aspx index 58ad700d..33bdcedd 100644 --- a/web/Views/Admin/Created.aspx +++ b/web/Views/Admin/Created.aspx @@ -5,8 +5,8 @@

Message

<%= Html.Encode(Model.Message) %>

Exit Code

<%= Html.Encode(Model.ExitCode) %>
Acces à la base de donnée -<%= Html.Encode(Model.Dbname) %>
-<%= Html.Encode(Model.Dbuser) %>
-<%= Html.Encode(Model.Password[0]) %> ... You should already know it.
-<%= Html.Encode(Model.Host) %>:<%= Model.Port %> +<%= Html.Encode(ViewData["DbName"]) %>
+<%= Html.Encode(ViewData["DbUser"]) %>
+<%= Html.Encode(ViewData["Host"]) %>
+
diff --git a/web/Views/Admin/InitDb.aspx b/web/Views/Admin/InitDb.aspx index eab5db87..47d4431b 100644 --- a/web/Views/Admin/InitDb.aspx +++ b/web/Views/Admin/InitDb.aspx @@ -8,12 +8,12 @@ <%= Html.LabelFor(model => model.Port) %>: <%= Html.TextBox( "Port" ) %> <%= Html.ValidationMessage("Port", "*") %>
-<%= Html.LabelFor(model => model.Dbname) %>: -<%= Html.TextBox( "Dbname" ) %> -<%= Html.ValidationMessage("Dbname", "*") %>
-<%= Html.LabelFor(model => model.Dbuser) %>: -<%= Html.TextBox( "Dbuser" ) %> -<%= Html.ValidationMessage("Dbuser", "*") %>
+<%= Html.LabelFor(model => model.DbName) %>: +<%= Html.TextBox( "DbName" ) %> +<%= Html.ValidationMessage("DbName", "*") %>
+<%= Html.LabelFor(model => model.DbUser) %>: +<%= Html.TextBox( "DbUser" ) %> +<%= Html.ValidationMessage("DbUser", "*") %>
<%= Html.LabelFor(model => model.Password) %>: <%= Html.Password( "Password" ) %> <%= Html.ValidationMessage("Password", "*") %>
diff --git a/web/Views/Admin/Restore.aspx b/web/Views/Admin/Restore.aspx index d5be1462..541cd514 100644 --- a/web/Views/Admin/Restore.aspx +++ b/web/Views/Admin/Restore.aspx @@ -22,12 +22,12 @@ <%= Html.LabelFor(model => model.Port) %>: <%= Html.TextBox( "Port" ) %> <%= Html.ValidationMessage("Port", "*") %>
-<%= Html.LabelFor(model => model.Dbname) %>: -<%= Html.TextBox( "Dbname" ) %> -<%= Html.ValidationMessage("Dbname", "*") %>
-<%= Html.LabelFor(model => model.Dbuser) %>: -<%= Html.TextBox( "Dbuser" ) %> -<%= Html.ValidationMessage("Dbuser", "*") %>
+<%= Html.LabelFor(model => model.DbName) %>: +<%= Html.TextBox( "DbName" ) %> +<%= Html.ValidationMessage("DbName", "*") %>
+<%= Html.LabelFor(model => model.DbUser) %>: +<%= Html.TextBox( "DbUser" ) %> +<%= Html.ValidationMessage("DbUser", "*") %>
<%= Html.LabelFor(model => model.Password) %>: <%= Html.Password( "Password" ) %> <%= Html.ValidationMessage("Password", "*") %>
diff --git a/yavscModel/Admin/DataAccess.cs b/yavscModel/Admin/DataAccess.cs index 4f9eca4c..0c304cbe 100644 --- a/yavscModel/Admin/DataAccess.cs +++ b/yavscModel/Admin/DataAccess.cs @@ -47,7 +47,7 @@ namespace Yavsc.Model.Admin /// Gets or sets the dbname. /// /// The dbname. - public string Dbname { + public string DbName { get { return dbname; } @@ -62,7 +62,7 @@ namespace Yavsc.Model.Admin /// Gets or sets the dbuser. /// /// The dbuser. - public string Dbuser { + public string DbUser { get { return dbuser; } @@ -101,7 +101,7 @@ namespace Yavsc.Model.Admin /// /// The string. public string ConnectionString { get { return string.Format ("Server={0};Port={1};Database={2};User Id={3};Password={4};Encoding=Unicode;", - Host, Port, Dbname, Dbuser, Password); } } + Host, Port, DbName, DbUser, Password); } } } } diff --git a/yavscModel/WorkFlow/TaskOutput.cs b/yavscModel/WorkFlow/TaskOutput.cs index 50318b55..fc9a192c 100644 --- a/yavscModel/WorkFlow/TaskOutput.cs +++ b/yavscModel/WorkFlow/TaskOutput.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel; -namespace Yavsc.Admin +namespace Yavsc.Model.Admin { ///