Commit c2410d6e authored by Sarun Mungthanya's avatar Sarun Mungthanya
Browse files

fix:issue prod

parent 3dca194a
...@@ -259,6 +259,10 @@ class SmartUpdateController extends Controller ...@@ -259,6 +259,10 @@ class SmartUpdateController extends Controller
$file_name_0 = ''; $file_name_0 = '';
$file_data_0 = ''; $file_data_0 = '';
} }
if(!isset($file_name_0)) {
$file_name_0 = '';
$file_data_0 = '';
}
$patchCodeServer = str_replace('Query2Var', 'static::Query2Var', $patchDetails->PATCHCODE_SERVER); $patchCodeServer = str_replace('Query2Var', 'static::Query2Var', $patchDetails->PATCHCODE_SERVER);
$patchCodeServer = str_replace('Query2SQL', 'static::Query2SQL', $patchCodeServer); $patchCodeServer = str_replace('Query2SQL', 'static::Query2SQL', $patchCodeServer);
if ($checkExchangeRate !== false) { if ($checkExchangeRate !== false) {
...@@ -293,7 +297,7 @@ class SmartUpdateController extends Controller ...@@ -293,7 +297,7 @@ class SmartUpdateController extends Controller
eval('$patchCode=<<<EOF2' . chr(13) . $patchCode . chr(13) . 'EOF2;' . chr(13)); eval('$patchCode=<<<EOF2' . chr(13) . $patchCode . chr(13) . 'EOF2;' . chr(13));
$patchCode = str_replace('#', '$', $patchCode); $patchCode = str_replace('#', '$', $patchCode);
$patchCode = iconv("UTF-8" , "TIS-620" , $patchCode);
if (isset($mode) && $mode === 'AUTO') { if (isset($mode) && $mode === 'AUTO') {
$pid = DB::table('conf_server_pendding as t0') $pid = DB::table('conf_server_pendding as t0')
->join('conf_smartupdate as t1', 't0.PatchID', '=', 't1.PID') ->join('conf_smartupdate as t1', 't0.PatchID', '=', 't1.PID')
......
...@@ -25,6 +25,19 @@ ...@@ -25,6 +25,19 @@
Livewire.on('updateSelectPatchAfterDeleted', () => { Livewire.on('updateSelectPatchAfterDeleted', () => {
this.clearAllSelections(); this.clearAllSelections();
}); });
Livewire.hook('message.processed', () => {
this.loadSelectedPatch();
this.resetCheckAllCheckbox();
this.bindCheckboxEvents();
});
},
bindCheckboxEvents() {
const checkboxes = document.querySelectorAll('.individual-checkbox');
checkboxes.forEach((checkbox) => {
checkbox.addEventListener('click', (event) => {
this.updateSelectedPatch(event);
});
});
}, },
toggleAllCheckboxes(event) { toggleAllCheckboxes(event) {
const checkboxes = document.querySelectorAll('.individual-checkbox'); const checkboxes = document.querySelectorAll('.individual-checkbox');
......
...@@ -13,8 +13,12 @@ ...@@ -13,8 +13,12 @@
}); });
}, },
serverKeySelect(id, value) { serverKeySelect(id, value) {
console.log('Selected:', id, value);
if (!this.serverKeyWaitingSend.some(item => item.id == id)) { if (!this.serverKeyWaitingSend.some(item => item.id == id)) {
this.serverKeyWaitingSend.push({ id, value }); this.serverKeyWaitingSend.push({ id, value });
console.log('Added:', this.serverKeyWaitingSend);
} else {
this.serverKeyWaitingSend = this.serverKeyWaitingSend.filter(item => item.id !== id);
} }
}, },
removeServerKey(id) { removeServerKey(id) {
...@@ -63,8 +67,8 @@ ...@@ -63,8 +67,8 @@
<div class="relative flex items-center w-full"> <div class="relative flex items-center w-full">
<input type="text" <input type="text"
class="form-input h-9 peer w-full rounded-lg border border-slate-300 bg-transparent px-3 py-2 placeholder:text-slate-400/70 hover:border-slate-400 focus:border-primary dark:border-navy-450 dark:hover:border-navy-400 dark:focus:border-accent" class="form-input h-9 peer w-full rounded-lg border border-slate-300 bg-transparent px-3 py-2 placeholder:text-slate-400/70 hover:border-slate-400 focus:border-primary dark:border-navy-450 dark:hover:border-navy-400 dark:focus:border-accent"
wire:model.debounce.1000ms="serverkey"
wire:model.debounce.1000ms="serverkey" placeholder="Search for a server key"> placeholder="Search for a server key">
<span wire:loading <span wire:loading
wire:target="serverkey, selectedOwnerType, company, db_type, cur_ver, selectAllResults" wire:target="serverkey, selectedOwnerType, company, db_type, cur_ver, selectAllResults"
class="absolute right-3"> class="absolute right-3">
...@@ -79,24 +83,19 @@ ...@@ -79,24 +83,19 @@
</span> </span>
</div> </div>
@if ($showSearch)
<ul x-show="open" @click.away="open = false" <ul x-show="open" @click.away="open = false"
class="absolute left-0 right-0 border border-gray-200 rounded-md max-h-64 overflow-auto z-50 bg-white"> class="absolute left-0 right-0 border border-gray-200 rounded-md max-h-64 overflow-auto z-50 bg-white">
<li class="p-2 bg-gray-200 hover:bg-gray-300 cursor-pointer font-semibold" <li class="p-2 bg-gray-200 hover:bg-gray-300 cursor-pointer font-semibold"
{{-- wire:click="selectAllResults" --}} @click="serverKeySelectAll()"> {{-- wire:click="selectAllResults" --}} @click="serverKeySelectAll()">
Select All Select All
</li> </li>
@forelse($resultsServerkey as $result) <template x-for="key in allKeys" :key="key.ID">
<li class="p-2 hover:bg-gray-100 cursor-pointer active:bg-[#065f46]" <li class="p-2 hover:bg-gray-100 cursor-pointer active:bg-[#065f46]"
@click="serverKeySelect('{{ $result->ID }}', '{{ $result->SNKEY }}')" @click="serverKeySelect(key.ID, key.SNKEY)">
value="{{ $result->SNKEY }}"> <span x-text="key.SNKEY"></span>
{{ $result->SNKEY }}
</li> </li>
@empty </template>
<li class="p-2 text-gray-500">No results found</li>
@endforelse
</ul> </ul>
@endif
</div> </div>
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment