diff options
Diffstat (limited to 'modules')
7 files changed, 77 insertions, 66 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/fs.js b/modules/luci-base/htdocs/luci-static/resources/fs.js index 6eb0390909..8a96ea87e2 100644 --- a/modules/luci-base/htdocs/luci-static/resources/fs.js +++ b/modules/luci-base/htdocs/luci-static/resources/fs.js @@ -50,7 +50,7 @@ callFileRead = rpc.declare({ callFileWrite = rpc.declare({ object: 'file', method: 'write', - params: [ 'path', 'data' ] + params: [ 'path', 'data', 'mode' ] }); callFileRemove = rpc.declare({ @@ -177,13 +177,17 @@ var FileSystem = L.Class.extend(/** @lends LuCI.fs.prototype */ { * The file data to write. If it is null, it will be set to an empty * string. * + * @param {number} [mode] + * The permissions to use on file creation. Default is 420 (0644). + * * @returns {Promise<number>} * Returns a promise resolving to `0` or rejecting with an error stating * the failure reason. */ - write: function(path, data) { + write: function(path, data, mode) { data = (data != null) ? String(data) : ''; - return callFileWrite(path, data).then(handleRpcReply.bind(this, { '': 0 })); + mode = (mode != null) ? mode : 420; // 0644 + return callFileWrite(path, data, mode).then(handleRpcReply.bind(this, { '': 0 })); }, /** diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js index caae812812..c1389a8fdf 100644 --- a/modules/luci-base/htdocs/luci-static/resources/ui.js +++ b/modules/luci-base/htdocs/luci-static/resources/ui.js @@ -2021,6 +2021,9 @@ return L.Class.extend({ document.querySelectorAll('[data-tab]').forEach(function(tab) { var parent = tab.parentNode; + if (L.dom.matches(tab, 'li') && L.dom.matches(parent, 'ul.cbi-tabmenu')) + return; + if (!parent.hasAttribute('data-tab-group')) parent.setAttribute('data-tab-group', groups.length); @@ -2053,6 +2056,9 @@ return L.Class.extend({ groupId = +group.getAttribute('data-tab-group'), selected = null; + if (group.getAttribute('data-initialized') === 'true') + return; + for (var i = 0, pane; pane = panes[i]; i++) { var name = pane.getAttribute('data-tab'), title = pane.getAttribute('data-tab-title'), @@ -2072,6 +2078,7 @@ return L.Class.extend({ } group.parentNode.insertBefore(menu, group); + group.setAttribute('data-initialized', true); if (selected === null) { selected = this.getActiveTabId(panes[0]); diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index e34387aa39..3296021ec5 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2019-10-20 13:07+0000\n" +"PO-Revision-Date: 2019-10-21 07:49+0000\n" "Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n" "Language-Team: Catalan <https://hosted.weblate.org/projects/openwrt/luci/ca/>" "\n" @@ -2244,7 +2244,7 @@ msgstr "" #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967 msgid "Host" -msgstr "Nom de màquina" +msgstr "Amfitrió" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21 msgid "Host entries" @@ -2269,7 +2269,7 @@ msgstr "" #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116 msgid "Hostname" -msgstr "Nom de màquina" +msgstr "Nom de l’amfitrió" #: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22 msgid "Hostname to send when requesting DHCP" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 01b67e5b8d..ecbe66a5bf 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:41+0200\n" -"PO-Revision-Date: 2019-10-16 07:49+0000\n" -"Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n" +"PO-Revision-Date: 2019-10-22 08:49+0000\n" +"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/openwrt/luci/es/>" "\n" "Language: es\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.9\n" +"X-Generator: Weblate 3.9.1-dev\n" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:867 msgid "%.1f dB" @@ -203,7 +203,7 @@ msgstr "" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)" -msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)" +msgstr "Sufijo (hex)<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-" #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:29 @@ -1107,11 +1107,11 @@ msgstr "Cerrar lista..." #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68 #: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201 msgid "Collecting data..." -msgstr "Recopilando datos…" +msgstr "Recolectando datos…" #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:12 msgid "Command" -msgstr "Orden" +msgstr "Comando" #: modules/luci-base/htdocs/luci-static/resources/rpc.js:393 msgid "Command OK" @@ -1119,7 +1119,7 @@ msgstr "Comando OK" #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:29 msgid "Command failed" -msgstr "Falló la orden" +msgstr "Comando fallido" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64 msgid "Comment" @@ -1525,27 +1525,27 @@ msgstr "Directorio" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:716 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:755 msgid "Disable" -msgstr "Deshabilitar" +msgstr "Desactivar" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531 msgid "" "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for " "this interface." msgstr "" -"Deshabilitar <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> " +"Desactivar <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> " "para esta interfaz." #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93 msgid "Disable Encryption" -msgstr "Deshabilitar encriptación" +msgstr "Desactivar encriptación" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:974 msgid "Disable Inactivity Polling" -msgstr "Deshabilitar el sondeo de inactividad" +msgstr "Desactivar sondeo de inactividad" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:714 msgid "Disable this network" -msgstr "Deshabilitar esta red" +msgstr "Desactivar esta red" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:61 @@ -1557,7 +1557,7 @@ msgstr "Deshabilitar esta red" #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69 msgid "Disabled" -msgstr "Deshabilitado" +msgstr "Desactivado" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:988 msgid "Disassociate On Low Acknowledgement" @@ -1708,8 +1708,8 @@ msgid "" "Dynamically allocate DHCP addresses for clients. If disabled, only clients " "having static leases will be served." msgstr "" -"Reparte direcciones DHCP dinámicamente a los clientes. Si se deshabilita, " -"sólo se dará a clientes con direcciones estáticas." +"Reparte direcciones DHCP dinámicamente a los clientes. Si se desactiva, sólo " +"se dará a clientes con direcciones estáticas." #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67 msgid "EA-bits length" @@ -1759,20 +1759,20 @@ msgid "" "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " "snooping" msgstr "" -"Habilitar <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"Activar <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " "Snooping" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" -msgstr "Habilitar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" +msgstr "Activar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60 msgid "Enable HE.net dynamic endpoint update" -msgstr "Habilitar actualización dinámica de punto final HE.net" +msgstr "Activar actualización dinámica de punto final HE.net" #: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89 msgid "Enable IPv6 negotiation" -msgstr "Habilitar negociación IPv6" +msgstr "Activar negociación IPv6" #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93 @@ -1781,82 +1781,82 @@ msgstr "Habilitar negociación IPv6" #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67 #: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93 msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Habilitar negociación IPv6 en el enlace PPP" +msgstr "Activar negociación IPv6 en el enlace PPP" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188 msgid "Enable Jumbo Frame passthrough" -msgstr "Habilitar paso de tramas jumbo" +msgstr "Activar paso de tramas jumbo" #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235 msgid "Enable NTP client" -msgstr "Habilitar cliente NTP" +msgstr "Activar cliente NTP" #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96 msgid "Enable Single DES" -msgstr "Habilitar solo DES" +msgstr "Activar sólo DES" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267 msgid "Enable TFTP server" -msgstr "Habilitar servidor TFTP" +msgstr "Activar servidor TFTP" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180 msgid "Enable VLAN functionality" -msgstr "Habilitar funcionalidad VLAN" +msgstr "Activar funcionalidad VLAN" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1596 msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE" -msgstr "Habilitar botón WPS, requiere WPA(2)-PSK/WPA3-SAE" +msgstr "Activar botón WPS, requiere WPA(2)-PSK/WPA3-SAE" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1583 msgid "Enable key reinstallation (KRACK) countermeasures" -msgstr "Habilitar las medidas correctivas de reinstalación de claves (KRACK)" +msgstr "Activar las medidas correctivas de reinstalación de claves (KRACK)" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183 msgid "Enable learning and aging" -msgstr "Habilitar aprendizaje y envejecimiento" +msgstr "Activar aprendizaje y envejecimiento" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194 msgid "Enable mirroring of incoming packets" -msgstr "Habilitar la duplicación de paquetes entrantes" +msgstr "Activar la duplicación de paquetes entrantes" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195 msgid "Enable mirroring of outgoing packets" -msgstr "Habilitar la duplicación de paquetes salientes" +msgstr "Activar la duplicación de paquetes salientes" #: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets." msgstr "" -"Habilita el indicador DF (No fragmentar) de los paquetes de encapsulación." +"Activar el indicador DF (No fragmentar) de los paquetes de encapsulación." #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:714 msgid "Enable this network" -msgstr "Habilitar esta red" +msgstr "Activar esta red" #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:73 msgid "Enable/Disable" -msgstr "Habilitar/Deshabilitar" +msgstr "Activar/Desactivar" #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:266 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:375 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:61 msgid "Enabled" -msgstr "Habilitado" +msgstr "Activar" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414 msgid "Enables IGMP snooping on this bridge" -msgstr "Habilita el protocolo IGMP Snooping en este puente" +msgstr "Activa el protocolo IGMP Snooping en este puente" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1311 msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" msgstr "" -"Habilita la itinerancia rápida entre los APs que pertenecen al mismo dominio " +"Activa la itinerancia rápida entre los APs que pertenecen al mismo dominio " "de movilidad" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412 msgid "Enables the Spanning Tree Protocol on this bridge" -msgstr "Habilita el protocolo Spanning Tree en este puente" +msgstr "Activa el protocolo Spanning Tree en este puente" #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59 msgid "Encapsulation limit" @@ -2578,11 +2578,11 @@ msgstr "Identidad" #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96 msgid "If checked, 1DES is enabled" -msgstr "Si está comprobado, 1DES está habilitado" +msgstr "Si está comprobado, 1DES está activado" #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93 msgid "If checked, encryption is disabled" -msgstr "Si está marcado, el encriptado estará deshabilitado" +msgstr "Si está marcado, la encriptación estará desactivada" #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:277 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:383 @@ -3835,8 +3835,8 @@ msgid "" "Recommended value if this device is behind a NAT is 25." msgstr "" "Opcional. Segundos entre los mensajes de mantener conectado. El valor " -"predeterminado es 0 (deshabilitado). El valor recomendado si este " -"dispositivo está detrás de un NAT es 25." +"predeterminado es 0 (desactivado). El valor recomendado es 25 si su " +"dispositivo está detrás de un NAT." #: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54 msgid "Optional. UDP port used for outgoing and incoming packets." @@ -5513,8 +5513,8 @@ msgid "" "There is no password set on this router. Please configure a root password to " "protect the web interface and enable SSH." msgstr "" -"No hay contraseñas en este router. Por favor, configure una contraseña para " -"proteger la interfaz web y habilitar SSH." +"No hay contraseñas en este dispositivo. Por favor, configure una contraseña " +"para proteger la interfaz web y activar SSH." #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49 msgid "This IPv4 address of the relay" @@ -5905,7 +5905,7 @@ msgstr "Usar <code>/etc/ethers</code>" #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264 msgid "Use DHCP advertised servers" -msgstr "Usar servidores anunciados de DHCP" +msgstr "Usar servidores anunciados por DHCP" #: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167 msgid "Use DHCP gateway" @@ -6148,7 +6148,7 @@ msgstr "" #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34 msgid "Waiting for command to complete..." -msgstr "Esperando a que la orden finalice…" +msgstr "Esperando a que se complete el comando..." #: modules/luci-base/htdocs/luci-static/resources/ui.js:2496 msgid "Waiting for configuration to get applied… %ds" @@ -6178,8 +6178,8 @@ msgid "" "key options." msgstr "" "Cuando se utiliza un PSK, el PMK se puede generar automáticamente. Cuando " -"está habilitada, las siguientes opciones de teclas R0/R1 no se aplican. " -"Deshabilite esto para usar las opciones de teclas R0 y R1." +"está activada, las siguientes opciones de teclas R0/R1 no se aplican. " +"Desactive esto para usar las opciones de teclas R0 y R1." #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:384 @@ -6225,7 +6225,7 @@ msgstr "Migración de configuración WiFi" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:140 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179 msgid "Wireless is disabled" -msgstr "Red WiFi deshabilitada" +msgstr "Red WiFi desactivada" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:102 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:140 @@ -6235,11 +6235,11 @@ msgstr "Red WiFi no asociada" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753 msgid "Wireless network is disabled" -msgstr "Red WiFi deshabilitada" +msgstr "Red WiFi desactivada" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753 msgid "Wireless network is enabled" -msgstr "Red WiFi habilitada" +msgstr "Red WiFi activada" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:182 msgid "Write received DNS requests to syslog" @@ -6268,10 +6268,10 @@ msgid "" "after a device reboot.<br /><strong>Warning: If you disable essential init " "scripts like \"network\", your device might become inaccessible!</strong>" msgstr "" -"Puede habilitar o deshabilitar los scripts de inicio instalados aquí. Los " +"Puede activar o desactivar los scripts de inicio instalados aquí. Los " "cambios se aplicarán después de que se reinicie el dispositivo.<br /> " -"<strong>Advertencia: Si deshabilitas los scripts de inicio esenciales como " -"\"network\", ¡Tu dispositivo podría volverse inaccesible!</strong>" +"<strong>Advertencia: Si desactivas los scripts de inicio esenciales como \"" +"network\", ¡Tu dispositivo podría volverse inaccesible!</strong>" #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184 #: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222 @@ -6280,7 +6280,7 @@ msgstr "" msgid "" "You must enable JavaScript in your browser or LuCI will not work properly." msgstr "" -"Debe habilitar JavaScript en su navegador o LuCI no funcionará correctamente." +"Debe activar JavaScript en su navegador o LuCI no funcionará correctamente." #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187 msgid "ZRam Compression Algorithm" @@ -6365,7 +6365,7 @@ msgstr "dBm" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890 msgid "disable" -msgstr "Deshabilitar" +msgstr "Desactivar" #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578 @@ -6373,7 +6373,7 @@ msgstr "Deshabilitar" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25 msgid "disabled" -msgstr "Deshabilitado" +msgstr "Desactivado" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:434 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:468 diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index 1032eaebe1..efe8304468 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"PO-Revision-Date: 2019-10-18 07:48+0000\n" +"PO-Revision-Date: 2019-10-22 08:49+0000\n" "Last-Translator: Zheng Qian <sotux82@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "openwrt/luci/zh_Hans/>\n" @@ -3451,7 +3451,7 @@ msgstr "前进 »" #: modules/luci-base/htdocs/luci-static/resources/form.js:1757 #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108 msgid "No" -msgstr "无" +msgstr "否" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514 msgid "No DHCP Server configured for this interface" diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js index d18246b6be..612c4a4f92 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js @@ -517,7 +517,7 @@ return L.view.extend({ o.forcewrite = true; o.rows = 30; o.load = function(section_id) { - return fs.read('/etc/sysupgrade.conf', ''); + return L.resolveDefault(fs.read('/etc/sysupgrade.conf'), ''); }; diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js index 84a1d64878..05d41b0dde 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js @@ -117,7 +117,7 @@ function renderKeys(keys) { } function saveKeys(keys) { - return fs.write('/etc/dropbear/authorized_keys', keys.join('\n') + '\n') + return fs.write('/etc/dropbear/authorized_keys', keys.join('\n') + '\n', 384 /* 0600 */) .then(renderKeys.bind(this, keys)) .catch(function(e) { L.ui.addNotification(null, E('p', e.message)) }) .finally(L.ui.hideModal); |