DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed some logging to make test debugging less verbose

Browse source
This commit is contained in:
snipe 2017-08-24 23:20:51 -07:00
parent a37cb616eb
commit 73ce5f98bb
4 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/Models/CustomField.php
View file

@ -38,12 +38,10 @@ class CustomField extends Model
public static function boot() public static function boot()
{ {
self::created(function ($custom_field) { self::created(function ($custom_field) {
\Log::debug("\n\nCreating Original Name: ".$custom_field->name);
\Log::debug('Creating Column Name: '.$custom_field->convertUnicodeDbSlug());
// column exists - nothing to do here
if (Schema::hasColumn(CustomField::$table_name, $custom_field->convertUnicodeDbSlug())) { if (Schema::hasColumn(CustomField::$table_name, $custom_field->convertUnicodeDbSlug())) {
\Log::debug('Column exists. Nothing to do here.');
return false; return false;
} }
@ -57,18 +55,13 @@ class CustomField extends Model
self::updating(function ($custom_field) { self::updating(function ($custom_field) {
\Log::debug('Updating column name');
\Log::debug('Updating Original Name: '.$custom_field->getOriginal("name"));
\Log::debug('Updating New Column Name: '.$custom_field->convertUnicodeDbSlug());
// Column already exists. Nothing to update.
if ($custom_field->isDirty("name")) { if ($custom_field->isDirty("name")) {
if (Schema::hasColumn(CustomField::$table_name, $custom_field->convertUnicodeDbSlug())) { if (Schema::hasColumn(CustomField::$table_name, $custom_field->convertUnicodeDbSlug())) {
\Log::debug('Column already exists. Nothing to update.');
return true; return true;
} }
\Log::debug('Updating column name to.'.$custom_field->convertUnicodeDbSlug());
return Schema::table(CustomField::$table_name, function ($table) use ($custom_field) { return Schema::table(CustomField::$table_name, function ($table) use ($custom_field) {
$table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal("name")), $custom_field->convertUnicodeDbSlug()); $table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal("name")), $custom_field->convertUnicodeDbSlug());
}); });
@ -85,7 +78,7 @@ class CustomField extends Model
public function fieldset() public function fieldset()
{ {
return $this->belongsToMany('\App\Models\CustomFieldset'); //?!?!?!?!?!? return $this->belongsToMany('\App\Models\CustomFieldset');
} }
public function user() public function user()
@ -102,10 +95,9 @@ class CustomField extends Model
public function db_column_name() public function db_column_name()
{ {
return $this->db_column; return $this->db_column;
// return self::convertUnicodeDbSlug();
} }
//mutators for 'format' attribute // mutators for 'format' attribute
public function getFormatAttribute($value) public function getFormatAttribute($value)
{ {
foreach (self::$PredefinedFormats as $name => $pattern) { foreach (self::$PredefinedFormats as $name => $pattern) {
@ -116,6 +108,13 @@ class CustomField extends Model
return $value; return $value;
} }
/**
* Format a value string as an array for select boxes and checkboxes.
*
* @author [A. Gianotto] [<snipe@snipe.net>]
* @since [v3.4]
* @return Array
*/
public function setFormatAttribute($value) public function setFormatAttribute($value)
{ {
if (isset(self::$PredefinedFormats[$value])) { if (isset(self::$PredefinedFormats[$value])) {

5
app/Models/Loggable.php
View file

@ -80,8 +80,11 @@ trait Loggable
'admin' => $log->user, 'admin' => $log->user,
'note' => $note 'note' => $note
]; ];
Setting::getSettings()->notify(new CheckoutNotification($params));
if ($settings = Setting::getSettings()) {
$settings->notify(new CheckoutNotification($params));
}
return $log; return $log;
} }

4
database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php
View file

@ -21,7 +21,7 @@ use Illuminate\Database\Schema\Blueprint;
function updateLegacyColumnName($customfield) { function updateLegacyColumnName($customfield) {
$name_to_db_name = CustomField::name_to_db_name($customfield->name); $name_to_db_name = CustomField::name_to_db_name($customfield->name);
\Log::debug('Trying to rename '.$name_to_db_name." to ".$customfield->convertUnicodeDbSlug()."...\n"); //\Log::debug('Trying to rename '.$name_to_db_name." to ".$customfield->convertUnicodeDbSlug()."...\n");
if (Schema::hasColumn(CustomField::$table_name, $name_to_db_name)) { if (Schema::hasColumn(CustomField::$table_name, $name_to_db_name)) {
@ -32,7 +32,7 @@ function updateLegacyColumnName($customfield) {
); );
} else { } else {
\Log::debug('Legacy DB column '.$name_to_db_name.' was not found on the assets table.'); //\Log::debug('Legacy DB column '.$name_to_db_name.' was not found on the assets table.');
} }
} }

2
database/migrations/2017_06_14_122059_add_next_autoincrement_to_settings.php
View file

@ -25,7 +25,7 @@ class AddNextAutoincrementToSettings extends Migration
$table->bigInteger('next_auto_tag_base')->default('1'); $table->bigInteger('next_auto_tag_base')->default('1');
}); });
\Log::debug('Setting '.$next.' as default auto-increment'); //\Log::debug('Setting '.$next.' as default auto-increment');
if ($settings = App\Models\Setting::first()) { if ($settings = App\Models\Setting::first()) {
$settings->next_auto_tag_base = $next; $settings->next_auto_tag_base = $next;