Administrator / FirstFullmaps

Commit a9a5efb8bf120a5146c8c4cd4d722b9b2c9fd257

Authored by Administrator
1 parent 1b4d46a3

test

Showing 1 changed file with 2 additions and 23 deletions   Show diff stats
Inline Side-by-side
src/Maps/Controllers/BusStopController.cs
  Show/Hide comments   View file @a9a5efb
... ... @@ -85,7 +85,7 @@ namespace Maps.Controllers
85 85 return Json(vm);
86 86 }
87 87  
88   -<<<<<<< HEAD
  88 +
89 89 // POST: BusStop/Create
90 90 // To protect from overposting attacks, please enable the specific properties you want to bind to, for
91 91 // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
... ... @@ -106,7 +106,7 @@ namespace Maps.Controllers
106 106 ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId);
107 107 return View(busStop);
108 108 }
109   -=======
  109 +
110 110 [HttpDelete]
111 111 public async Task<IActionResult> Delete(int? id)
112 112 {
... ... @@ -126,27 +126,6 @@ namespace Maps.Controllers
126 126 return Json(busStop);
127 127 }
128 128  
129   - // // POST: BusStop/Create
130   - // // To protect from overposting attacks, please enable the specific properties you want to bind to, for
131   - // // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
132   - // [HttpPost]
133   - // [ValidateAntiForgeryToken]
134   - // public async Task<IActionResult> Create([Bind("BusStopId,AreaLandAvailability,AreaStopAvailability,BalanceCost,BusStationCardId,CrossSectionNumber,DateActual,LocationLeft,LocationRight,PocketAvailability,Position,RegionId,RepairCertificate,RoadId,SettlementId,StateCommonId,SurfaceTypeId,ToiletAvailability,YearBuild,YearRepair")] BusStop busStop)
135   - // {
136   - // if (ModelState.IsValid)
137   - // {
138   - // _context.Add(busStop);
139   - // await _context.SaveChangesAsync();
140   - // return RedirectToAction("Index");
141   - // }
142   - // ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId", busStop.RegionId);
143   - // ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "RoadId", busStop.RoadId);
144   - // ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name", busStop.SettlementId);
145   - // ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "StateCommonId", busStop.StateCommonId);
146   - // ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId);
147   - // return View(busStop);
148   - // }
149   ->>>>>>> 94ffda14065b6ab5d25c52ed714e112165a70cae
150 129  
151 130 // // GET: BusStop/Edit/5
152 131 // public async Task<IActionResult> Edit(int? id)
... ...