@@ -131,43 +131,42 @@ public function update(IssueRequest $request, $slug)
131131
132132 public function statusUpdate (Request $ request , $ slug = null , $ status = 0 )
133133 {
134- if (!isset ($ request ->status_id )) {
135- $ request ->status_id = $ status ;
136- }
134+ $ request ->status_id = $ request ->status_id ?? $ status ;
137135
138136 if ($ request ->ajax ()) {
139- $ response = resolve ('IssueService ' )->setRequest ($ request )
140- ->updateStatusByJson ();
137+ $ status = false ;
141138
142- if ($ response ) {
143- return response ()->json ([
144- 'success ' => true ,
145- ]);
139+ if ($ response = resolve ('IssueService ' )->setRequest ($ request )
140+ ->updateStatusByJson ()) {
141+ $ status = true ;
146142 }
147143
148144 return response ()->json ([
149- 'success ' => false ,
145+ 'success ' => $ status ,
150146 ]);
151- } else {
152- $ request ->slug = $ slug ;
153- resolve ('IssueService ' )->setRequest ($ request )->updateStatus ();
154-
155- return back ()->with ('success ' , trans ('gitscrum.updated-successfully ' ));
156147 }
148+
149+ $ request ->slug = $ slug ;
150+
151+ resolve ('IssueService ' )->setRequest ($ request )->updateStatus ();
152+
153+ return back ()->with ('success ' , trans ('gitscrum.updated-successfully ' ));
157154 }
158155
159156 public function destroy (Request $ request )
160157 {
161158 $ issue = Issue::slug ($ request ->slug )->firstOrFail ();
162159
160+ [$ route , $ params ] = ['sprints.show ' ,
161+ ['slug ' => $ issue ->sprint ->slug ]];
162+
163163 if (isset ($ issue ->userStory )) {
164- $ redirect = redirect ()->route ('user_stories.show ' , ['slug ' => $ issue ->userStory ->slug ]);
165- } else {
166- $ redirect = redirect ()->route ('sprints.show ' , ['slug ' => $ issue ->sprint ->slug ]);
164+ [$ route , $ params ] = ['user_stories.show ' ,
165+ ['slug ' => $ issue ->userStory ->slug ]];
167166 }
168167
169168 $ issue ->delete ();
170169
171- return $ redirect ;
170+ return redirect ()-> route ( $ route , $ params ) ;
172171 }
173172}
0 commit comments