Index: trunk/Wierszowki/Wierszowki.Web/Controllers/UserController.cs
===================================================================
--- trunk/Wierszowki/Wierszowki.Web/Controllers/UserController.cs (revision 823)
+++ trunk/Wierszowki/Wierszowki.Web/Controllers/UserController.cs (revision 842)
@@ -1,2 +1,3 @@
+using System;
 using System.Linq;
 using System.Web.Mvc;
@@ -6,4 +7,6 @@
 using Wierszowki.Services.Interfaces;
 using xVal.ServerSide;
+using Wierszowki.Models;
+using System.Collections.Generic;
 
 namespace Wierszowki.Controllers
@@ -52,6 +55,9 @@
 
             if (ModelState.IsValid)
-                return View("Confirm", user);
-
+            {
+                var userConfirmViewData = new UserConfirmViewData();
+                userConfirmViewData = InitUserConfirmViewData("Potwierdzenie dodania u¿ytkownika", "", OperationType.Create, user);   
+                return View("Confirm", userConfirmViewData);
+            }
             return View(user);
         }
@@ -62,4 +68,5 @@
             return View(user);
         }
+
         [Authorize]
         [AcceptVerbs(HttpVerbs.Get)]
@@ -67,4 +74,5 @@
         {
             User user = _service.Find(id);
+            string errorInfo = "";
             if (user != null)
             {
@@ -77,11 +85,14 @@
                 else
                 {
-                    ViewData["message"] = "error_user";
-                    return View("Confirm"); 
+                    var userConfirmViewData = new UserConfirmViewData();
+                    errorInfo = "Nie mo¿na edytowaæ u¿ytkownika, gdy¿ login ró¿ni siê od zalogowanego!!!";
+                    userConfirmViewData = InitUserConfirmViewData("Edycja u¿ytkownika", errorInfo, OperationType.ErrorLogin, null);
+                    return View("Confirm", userConfirmViewData);                    
                 }
-
             }
-            ViewData["message"] = "error";
-            return View("Confirm");          
+            var userConfirmViewData1 = new UserConfirmViewData();
+            errorInfo = "Nie mo¿na edytowaæ u¿ytkownika, gdy¿ u¿ytkownik o takim id nie istnieje !!!";
+            userConfirmViewData1 = InitUserConfirmViewData("Edycja u¿ytkownika", errorInfo, OperationType.ErrorUser, null);
+            return View("Confirm", userConfirmViewData1);                 
         }
 
@@ -101,8 +112,21 @@
 
             if (ModelState.IsValid)
-                return View("Confirm", user);
-
-
+            {
+                var userConfirmViewData = new UserConfirmViewData();
+                userConfirmViewData = InitUserConfirmViewData("Potwierdzenie edycji u¿ytkownika", "", OperationType.Update, user);
+                return View("Confirm", userConfirmViewData); 
+            }
             return View(user);
+        }
+        private UserConfirmViewData InitUserConfirmViewData(string naglowek, string error, OperationType u_type, User user)
+        {
+            var viewData = new  UserConfirmViewData
+            {
+                Naglowek = naglowek,
+                ErrorInfo= error,
+                Akcja  = u_type,
+                User = user
+            };
+            return viewData;        
         }
     }
