Zbiór zmian 838 dla branches/Emisje/Wierszowki/Wierszowki.Web/Controllers
- Data:
- 2009-09-30 15:49:14 (17 years ago)
- Lokalizacja:
- branches/Emisje
- Pliki:
-
- 4 zmodyfikowane
-
. (zmodyfikowane) (1 prop)
-
Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs (zmodyfikowane) (5 diffs)
-
Wierszowki/Wierszowki.Web/Controllers/ReportController.cs (zmodyfikowane) (1 diff)
-
Wierszowki/Wierszowki.Web/Controllers/UserController.cs (zmodyfikowane) (2 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
branches/Emisje
- Property svn:mergeinfo
-
old new 1 /branches/AutoShopper:815-818 1 2 /branches/ReklamaReorganizacja:568-731 2 /trunk:774-810 3 /tags/BazaReklam_1.1.28:831 4 /trunk:774-837
-
- Property svn:mergeinfo
-
branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs
r796 r838 52 52 return RedirectToAction("Confirm", _context.Authors.Single(a => a.Id == magazineItem.AuthorId)); 53 53 } 54 55 54 var viewData = InitMagazineItemViewData(); 56 55 viewData.MagazineItem = magazineItem; 56 57 57 return View(viewData); 58 58 } … … 69 69 var viewData = InitMagazineItemViewData(); 70 70 var magazineItem = _service.Find(id); 71 72 if (magazineItem == null) 73 { 74 ViewData["message"] = "null"; 75 return View("Confirm"); 76 } 77 71 78 viewData.MagazineItem = magazineItem; 72 79 viewData.Magazine = magazineItem.Issue.Magazine; … … 75 82 return View(viewData); 76 83 } 77 78 84 [Authorize] 79 85 [AcceptVerbs(HttpVerbs.Post)] … … 94 100 { 95 101 var author = _context.Authors.Single(a => a.Id == magazineItem.AuthorId); 96 97 102 return RedirectToAction("Confirm", author); 98 103 } 99 100 104 var viewData = InitMagazineItemViewData(); 101 105 viewData.MagazineItem = magazineItem; … … 115 119 return viewData; 116 120 } 121 [Authorize] 122 public ActionResult Delete(int id) 123 { 124 return View("Delete"); 125 } 126 [Authorize] 127 [AcceptVerbs(HttpVerbs.Post)] 128 public ActionResult Delete(MagazineItem magazineItem) 129 { 130 _service.Delete(magazineItem); 131 if (magazineItem.AuthorId == 0){ 132 ViewData["message"] = "null"; 133 return View("Confirm"); 134 } 135 ViewData["message"] = "delete"; 136 return View("Confirm"); 137 138 } 117 139 } 118 140 } -
branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/ReportController.cs
r796 r838 33 33 public ActionResult Index() 34 34 { 35 35 36 var viewData = new ReportViewData 36 37 { 37 Authors = _context.GetAuthors().OrderBy(a => a.FullName).ToList() 38 Authors = _context.GetAuthors().OrderBy(a => a.FullName).ToList(), 39 EmploymentTypeList = new SelectList(_context.GetEmploymentTypes().ToList(),"Id","Name"), 40 UserList = new SelectList(_context.GetUsers().OrderBy(u => u.FirstName).ToList(),"Id","FullName") 38 41 }; 39 42 return View(viewData); -
branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/UserController.cs
r752 r838 62 62 return View(user); 63 63 } 64 65 64 [Authorize] 66 65 [AcceptVerbs(HttpVerbs.Get)] 67 66 public ActionResult Edit(int id) 68 67 { 68 User user = _service.Find(id); 69 if (user != null) 70 { 71 string name = ControllerContext.HttpContext.User.Identity.Name; 72 var LogInUser = _service.FindOne(u => u.Login == name); 73 if (LogInUser.Id == user.Id) 74 { 69 75 return View(_service.Find(id)); 76 } 77 else 78 { 79 ViewData["message"] = "error_user"; 80 return View("Confirm"); 81 } 82 83 } 84 ViewData["message"] = "error"; 85 return View("Confirm"); 70 86 } 71 87 … … 77 93 { 78 94 _service.Update(user); 95 79 96 } 80 97 catch (RulesException ex)
