ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix display "Disabled" status in UI

install-with-shinobicctv-user-instead-of-root
Moe 2020-08-14 14:25:46 -07:00
parent b71dc60f20
commit 1b6d07560c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/libs/js/super.customAutoLoad.js
View File

@ -10,7 +10,7 @@ $(document).ready(function(){
if(listElement.find('[package-name="${module.name}"]').length > 0){ if(listElement.find('[package-name="${module.name}"]').length > 0){
var existingElement = listElement.find('[package-name="${module.name}"]') var existingElement = listElement.find('[package-name="${module.name}"]')
existingElement.find('.title').text(humanName) existingElement.find('.title').text(humanName)
existingElement.find('[calm-action="status"]').text(module.disabled ? lang.Enable : lang.Disable) existingElement.find('[calm-action="status"]').text(module.properties.disabled ? lang.Enable : lang.Disable)
}else{ }else{
listElement.append(` listElement.append(`
<div class="col-md-12"> <div class="col-md-12">
@ -24,7 +24,7 @@ $(document).ready(function(){
${module.hasInstaller ? ` ${module.hasInstaller ? `
<a href="#" class="btn btn-sm btn-info" calm-action="install">${lang['Run Installer']}</a> <a href="#" class="btn btn-sm btn-info" calm-action="install">${lang['Run Installer']}</a>
` : ''} ` : ''}
<a href="#" class="btn btn-sm btn-default" calm-action="status">${module.disabled ? lang.Enable : lang.Disable}</a> <a href="#" class="btn btn-sm btn-default" calm-action="status">${module.properties.disabled ? lang.Enable : lang.Disable}</a>
` : ''} ` : ''}
<a href="#" class="btn btn-sm btn-danger" calm-action="delete">${lang.Delete}</a> <a href="#" class="btn btn-sm btn-danger" calm-action="delete">${lang.Delete}</a>
</div> </div>
@ -113,10 +113,10 @@ $(document).ready(function(){
}) })
break; break;
case'status': case'status':
setModuleStatus(packageName,!!!loadedModules[packageName].disabled,function(data){ setModuleStatus(packageName,!!!loadedModules[packageName].properties.disabled,function(data){
if(data.ok){ if(data.ok){
loadedModules[packageName].disabled = !!!loadedModules[packageName].disabled loadedModules[packageName].properties.disabled = !!!loadedModules[packageName].properties.disabled
el.text(loadedModules[packageName].disabled ? lang.Enable : lang.Disable) el.text(loadedModules[packageName].properties.disabled ? lang.Enable : lang.Disable)
} }
}) })
break; break;
@ -136,6 +136,7 @@ $(document).ready(function(){
downloadModule(form.downloadUrl,form.packageRoot,function(data){ downloadModule(form.downloadUrl,form.packageRoot,function(data){
console.log(data) console.log(data)
if(data.ok){ if(data.ok){
data.newModule.properties.disabled = true
drawModuleBlock(data.newModule) drawModuleBlock(data.newModule)
} }
}) })