diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index aaefa02..5b739a9 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -72,7 +72,6 @@ public function edit(Activity $activity) public function update(Request $request, Activity $activity) { $activity->update($request->all()); - return redirect()->route('activity.index'); } diff --git a/app/Http/Controllers/TeachingObjectController.php b/app/Http/Controllers/TeachingObjectController.php index 6d378a4..9dc8739 100644 --- a/app/Http/Controllers/TeachingObjectController.php +++ b/app/Http/Controllers/TeachingObjectController.php @@ -75,7 +75,9 @@ public function edit(TeachingObject $teachingObject) $tags = Tag::all(); $resources = Resource::all(); $activities = Activity::all(); - return view('teachingObject.update',['teachingObject'=> $teachingObject, 'users' => $users, 'authors' => $this->getIds($teachingObject->authors), 'tags' => $tags, 'Tags'=> $this->getIds($teachingObject->Tags), 'resources' => $resources, 'Resources' => $this->getIds($teachingObject->Resources), 'activities' => $activities, 'Activities' => $this->getIds($teachingObject->Activities)]); + return view('teachingObject.update',['teachingObject'=> $teachingObject, 'users' => $users, 'authors' => $this->getIds($teachingObject->authors), + 'tags' => $tags, 'Tags'=> $this->getIds($teachingObject->Tags), 'resources' => $resources, 'Resources' => $this->getIds($teachingObject->Resources), + 'activities' => $activities, 'Activities' => $this->getIds($teachingObject->Activities)]); } /** diff --git a/resources/views/Activity/create.blade.php b/resources/views/Activity/create.blade.php old mode 100644 new mode 100755 index 98c0a84..8a7fe97 --- a/resources/views/Activity/create.blade.php +++ b/resources/views/Activity/create.blade.php @@ -40,9 +40,8 @@
{{$activity->procedure}} | {{$activity->suggestions}} | -{{$activity->achievementExpectation}} | -{{$activity->implementationResult}} | +{{$activity->achievementExpectation}} | +{{$activity->implementationResult}} |
+
+
diff --git a/resources/views/Activity/update.blade.php b/resources/views/Activity/update.blade.php
old mode 100644
new mode 100755
index 5e1667c..9903a5b
--- a/resources/views/Activity/update.blade.php
+++ b/resources/views/Activity/update.blade.php
@@ -42,9 +42,8 @@
+ Cerrar
+
+
+
+
-
+
+ Cerrar
-
+
+ Cerrar
|