frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Tidy up sheets/flows labelling

This commit is contained in:
Nick O'Leary 2015-11-05 14:22:15 +00:00
parent c90fd1e6d8
commit a0aee2021d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/js/ui/editor.js
View File

@ -792,8 +792,8 @@ RED.editor = (function() {
var tabSelect = $("#node-config-dialog-scope").empty();
tabSelect.off("change");
tabSelect.append('<option value=""'+(!configNode.z?" selected":"")+' data-i18n="workspace.config.global"></option>');
tabSelect.append('<option disabled>flows</option>');
tabSelect.append('<option value=""'+(!configNode.z?" selected":"")+' data-i18n="sidebar.config.global"></option>');
tabSelect.append('<option disabled data-i18n="sidebar.config.flows"></option>');
RED.nodes.eachWorkspace(function(ws) {
var workspaceLabel = ws.label;
if (nodeUserFlows[ws.id]) {
@ -801,7 +801,7 @@ RED.editor = (function() {
}
tabSelect.append('<option value="'+ws.id+'"'+(ws.id==configNode.z?" selected":"")+'>'+workspaceLabel+'</option>');
});
tabSelect.append('<option disabled>subflows</option>');
tabSelect.append('<option disabled data-i18n="sidebar.config.subflows"></option>');
RED.nodes.eachSubflow(function(ws) {
var workspaceLabel = ws.name;
if (nodeUserFlows[ws.id]) {

10
locales/en-US/editor.json
View File

@ -30,7 +30,7 @@
"subflows": "Subflows",
"createSubflow": "Create Subflow",
"selectionToSubflow": "Selection to Subflow",
"flows": "Sheets",
"flows": "Tabs",
"add": "Add",
"rename": "Rename",
"delete": "Delete",
@ -197,9 +197,11 @@
"config": {
"name": "Configuration nodes",
"label": "config",
"local": "on this sheet",
"global": "on all sheets",
"none": "none"
"local": "on this flow",
"global": "on all flows",
"none": "none",
"subflows": "subflows",
"flows": "flows"
}
}
}

2
red/api/credentials.js
View File

@ -14,6 +14,7 @@
* limitations under the License.
**/
var log = require("../log");
var api = require("../nodes");
module.exports = {
@ -23,6 +24,7 @@ module.exports = {
// registry module that knows about node types.
var nodeType = req.params.type;
var nodeID = req.params.id;
log.audit({event: "credentials.get",type:nodeType,id:nodeID},req);
var credentials = api.getCredentials(nodeID);
if (!credentials) {
res.json({});