Zbiór zmian 847 dla trunk/Wierszowki/Wierszowki.Web/Controllers

Data:

2009-10-06 13:35:06 (17 years ago)

Autor:

alina

Opis:

re #205

Lokalizacja:

trunk/Wierszowki/Wierszowki.Web/Controllers

Pliki:

• MagazineItemController.cs (zmodyfikowane) (2 diffs)
• UserController.cs (zmodyfikowane) (1 diff)

trunk/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs

@@ -57 +57 @@
                 return View("Confirm", confirmViewData);
             }
+            var magazine = _service.Find(magazineItem.Id);
             var viewData = InitMagazineItemViewData();
             viewData.MagazineItem = magazineItem;
-
+            if (magazineItem.IssueId != 0)
+            {
+                viewData.Issue = _context.Issues.Single(i => i.Id == magazineItem.IssueId);
+                viewData.Magazine = viewData.Issue.Magazine;
+                viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazineItem.IssueId, 0), "Id", "Number");
+            }
             return View(viewData);
         }
@@ -142 +148 @@
             var magazine = _service.Find(magazineItem.Id);
             var viewData = InitMagazineItemViewData();
-            viewData.Info = info;//InitInfo(info.powrot, info.month, info.year, info.user_id);
+            viewData.Info = info;
             viewData.MagazineItem = magazine;
+            if (magazineItem.IssueId != 0)
+            {
+                viewData.Issue = _context.Issues.Single(i => i.Id == magazine.IssueId);
+                viewData.Magazine = magazine.Issue.Magazine;
+                viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazine.Issue.Id, 0), "Id", "Number");
+            }
             return View("Edit", viewData);
         }

trunk/Wierszowki/Wierszowki.Web/Controllers/UserController.cs

@@ -79 +79 @@
                 string name = ControllerContext.HttpContext.User.Identity.Name;
                 var LogInUser = _service.FindOne(u => u.Login == name);
-                if (LogInUser.Id == user.Id)
+                if (LogInUser.Id == user.Id || LogInUser.Id == 1)
                 {
                     return View(_service.Find(id));