Skip to content

Commit

Permalink
fixed update routes
Browse files Browse the repository at this point in the history
  • Loading branch information
denisdulici committed Feb 24, 2020
1 parent 558b51d commit 0bca0cc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
7 changes: 3 additions & 4 deletions app/Http/Controllers/Install/Updates.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@

class Updates extends Controller
{

/**
* Show the form for creating a new resource.
* Display a listing of the resource.
*
* @return Response
*/
Expand Down Expand Up @@ -70,13 +69,13 @@ public function check()
}

/**
* Update the core or modules.
* Run the update.
*
* @param $alias
* @param $version
* @return Response
*/
public function update($alias, $version)
public function run($alias, $version)
{
if ($alias == 'core') {
$name = 'Akaunting ' . $version;
Expand Down
4 changes: 2 additions & 2 deletions resources/views/install/updates/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{ trans('updates.new_core') }}
</div>
<div class="col-sm-10 col-md-6 text-right">
<a href="{{ route('updates.update', ['alias' => 'core', 'version' => $core]) }}"
<a href="{{ route('updates.run', ['alias' => 'core', 'version' => $core]) }}"
class="btn btn-info btn-sm header-button-top long-texts">
<i class="fa fa-refresh"></i> &nbsp;{{ trans('updates.update', ['version' => $core]) }}
</a>
Expand Down Expand Up @@ -61,7 +61,7 @@ class="btn btn-info btn-sm header-button-top long-texts">
<td class="col-sm-3 col-md-2 d-none d-sm-block">{{ $module->installed }}</td>
<td class="col-xs-4 col-md-2 col-sm-3">{{ $module->latest }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-center">
<a href="{{ route('updates.update', ['alias' => $module->alias, 'version' => $module->latest]) }}" class="btn btn-warning btn-sm">
<a href="{{ route('updates.run', ['alias' => $module->alias, 'version' => $module->latest]) }}" class="btn btn-warning btn-sm">
<i class="fa fa-refresh" aria-hidden="true"></i> {{ trans_choice('general.updates', 1) }}
</a>
</td>
Expand Down
4 changes: 2 additions & 2 deletions routes/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,17 @@
});

Route::group(['prefix' => 'install'], function () {
Route::get('updates', 'Install\Updates@index')->name('updates.index');
Route::get('updates/changelog', 'Install\Updates@changelog')->name('updates.changelog');
Route::get('updates/check', 'Install\Updates@check')->name('updates.check');
Route::get('updates/update/{alias}/{version}', 'Install\Updates@update')->name('updates.update');
Route::get('updates/run/{alias}/{version}', 'Install\Updates@run')->name('updates.run');
Route::post('updates/steps', 'Install\Updates@steps')->name('updates.steps');
Route::post('updates/download', 'Install\Updates@download')->middleware('api.key')->name('updates.download');
Route::post('updates/unzip', 'Install\Updates@unzip')->middleware('api.key')->name('updates.unzip');
Route::post('updates/copy-files', 'Install\Updates@copyFiles')->middleware('api.key')->name('updates.copy');
Route::post('updates/migrate', 'Install\Updates@migrate')->name('updates.migrate');
Route::post('updates/finish', 'Install\Updates@finish')->name('updates.finish');
Route::post('updates/redirect', 'Install\Updates@redirect')->name('updates.redirect');
Route::resource('updates', 'Install\Updates');
});

Route::group(['as' => 'modals.', 'prefix' => 'modals'], function () {
Expand Down

0 comments on commit 0bca0cc

Please sign in to comment.