DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'v3' of github.com:snipe/snipe-it into v3

Browse source
This commit is contained in:
snipe 2016-05-24 16:10:45 -07:00
parent 84edc9cf25 8b023adba3
commit 0c33575962
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/StatuslabelsController.php
View file

@ -227,7 +227,7 @@ class StatuslabelsController extends Controller
if ($statuslabel->has_assets() > 0) { if ($statuslabel->has_assets() > 0) {
// Redirect to the asset management page // Redirect to the asset management page
return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.assoc_users')); return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.assoc_assets'));
} else { } else {
$statuslabel->delete(); $statuslabel->delete();

2
database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php
View file

@ -14,7 +14,7 @@ class RemoveOptionKeysFromSettingsTable extends Migration
{ {
Schema::table('settings', function (Blueprint $table) { Schema::table('settings', function (Blueprint $table) {
// //
if(Schema::hasColumn('option_name', 'settings')) if(Schema::hasColumn('settings', 'option_name'))
$table->dropColumn('option_name'); $table->dropColumn('option_name');
}); });
} }

2
database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php
View file

@ -14,7 +14,7 @@ class RemoveOptionValueFromSettingsTable extends Migration
{ {
Schema::table('settings', function (Blueprint $table) { Schema::table('settings', function (Blueprint $table) {
// //
if(Schema::hasColumn('option_value', 'settings')) if(Schema::hasColumn('settings', 'option_value'))
$table->dropColumn('option_value'); $table->dropColumn('option_value');
}); });
} }

18
resources/lang/en/admin/statuslabels/message.php
View file

@ -2,24 +2,24 @@
return array( return array(
'does_not_exist' => 'Location does not exist.', 'does_not_exist' => 'Status Label does not exist.',
'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',
'create' => array( 'create' => array(
'error' => 'Location was not created, please try again.', 'error' => 'Status Label was not created, please try again.',
'success' => 'Location created successfully.' 'success' => 'Status Label created successfully.'
), ),
'update' => array( 'update' => array(
'error' => 'Location was not updated, please try again', 'error' => 'Status Label was not updated, please try again',
'success' => 'Location updated successfully.' 'success' => 'Status Label updated successfully.'
), ),
'delete' => array( 'delete' => array(
'confirm' => 'Are you sure you wish to delete this status label?', 'confirm' => 'Are you sure you wish to delete this Status Label?',
'error' => 'There was an issue deleting the location. Please try again.', 'error' => 'There was an issue deleting the Status Label. Please try again.',
'success' => 'The location was deleted successfully.' 'success' => 'The Status Label was deleted successfully.'
) )
); );