mirror of
https://github.com/node-red/node-red.git
synced 2025-03-01 10:36:34 +00:00
Merge pull request #4676 from kazuhitoyokoi/dev-fixpulldependencies
Enable updating dependency node of package.json in project feature
This commit is contained in:
commit
faf142cf66
@ -287,7 +287,7 @@ RED.projects.settings = (function() {
|
||||
var notInstalledCount = 0;
|
||||
|
||||
for (var m in modulesInUse) {
|
||||
if (modulesInUse.hasOwnProperty(m)) {
|
||||
if (modulesInUse.hasOwnProperty(m) && !activeProject.dependencies.hasOwnProperty(m)) {
|
||||
depsList.editableList('addItem',{
|
||||
id: modulesInUse[m].module,
|
||||
version: modulesInUse[m].version,
|
||||
@ -307,8 +307,8 @@ RED.projects.settings = (function() {
|
||||
|
||||
if (activeProject.dependencies) {
|
||||
for (var m in activeProject.dependencies) {
|
||||
if (activeProject.dependencies.hasOwnProperty(m) && !modulesInUse.hasOwnProperty(m)) {
|
||||
var installed = !!RED.nodes.registry.getModule(m);
|
||||
if (activeProject.dependencies.hasOwnProperty(m)) {
|
||||
var installed = !!RED.nodes.registry.getModule(m) && activeProject.dependencies[m] === modulesInUse[m].version;
|
||||
depsList.editableList('addItem',{
|
||||
id: m,
|
||||
version: activeProject.dependencies[m], //RED.nodes.registry.getModule(module).version,
|
||||
|
@ -242,7 +242,9 @@ function loadProject(name) {
|
||||
|
||||
function getProject(user, name) {
|
||||
checkActiveProject(name);
|
||||
return Promise.resolve(activeProject.export());
|
||||
return loadProject(name).then(function () {
|
||||
return Promise.resolve(activeProject.export());
|
||||
});
|
||||
}
|
||||
|
||||
function deleteProject(user, name) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user