frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Keep remote branch state in sync between editor and runtime

Browse Source
This commit is contained in:
Nick O'Leary 2018-05-02 13:59:39 +01:00
parent e3520309fc
commit c4d1ccb6f5
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/js/ui/projects/projectSettings.js
View File

@ -1255,6 +1255,14 @@ RED.projects.settings = (function() {
text: 'Delete remote', text: 'Delete remote',
click: function() { click: function() {
notification.close(); notification.close();
if (activeProject.git.branches.remote && activeProject.git.branches.remote.indexOf(entry.name+"/") === 0) {
delete activeProject.git.branches.remote;
}
if (activeProject.git.branches.remoteAlt && activeProject.git.branches.remoteAlt.indexOf(entry.name+"/") === 0) {
delete activeProject.git.branches.remoteAlt;
}
var url = "projects/"+activeProject.name+"/remotes/"+entry.name; var url = "projects/"+activeProject.name+"/remotes/"+entry.name;
var options = { var options = {
url: url, url: url,
@ -1276,6 +1284,7 @@ RED.projects.settings = (function() {
activeProject.git.remotes[name] = remote; activeProject.git.remotes[name] = remote;
}); });
} }
delete activeProject.git.branches.remoteAlt;
RED.sidebar.versionControl.refresh(); RED.sidebar.versionControl.refresh();
}); });
}, },

2
editor/js/ui/projects/projects.js
View File

@ -602,6 +602,7 @@ RED.projects = (function() {
} }
$(".projects-dialog-screen-create-row-auth-error").hide(); $(".projects-dialog-screen-create-row-auth-error").hide();
$("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://");
projectRepoUserInput.removeClass("input-error"); projectRepoUserInput.removeClass("input-error");
projectRepoPasswordInput.removeClass("input-error"); projectRepoPasswordInput.removeClass("input-error");
@ -1503,6 +1504,7 @@ RED.projects = (function() {
} }
$(".projects-dialog-screen-create-row-auth-error").hide(); $(".projects-dialog-screen-create-row-auth-error").hide();
$("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://");
projectRepoUserInput.removeClass("input-error"); projectRepoUserInput.removeClass("input-error");
projectRepoPasswordInput.removeClass("input-error"); projectRepoPasswordInput.removeClass("input-error");

14
editor/js/ui/projects/tab-versionControl.js
View File

@ -592,7 +592,10 @@ RED.sidebar.versionControl = (function() {
closeBranchBox(); closeBranchBox();
localCommitListShade.show(); localCommitListShade.show();
$(this).addClass('selected'); $(this).addClass('selected');
var activeProject = RED.projects.getActiveProject();
$("#sidebar-version-control-repo-toolbar-set-upstream-row").toggle(!!activeProject.git.branches.remoteAlt);
remoteBox.show(); remoteBox.show();
setTimeout(function() { setTimeout(function() {
remoteBox.css("height","265px"); remoteBox.css("height","265px");
},100); },100);
@ -868,7 +871,8 @@ RED.sidebar.versionControl = (function() {
if (activeProject.git.branches.remoteAlt) { if (activeProject.git.branches.remoteAlt) {
url+="/"+activeProject.git.branches.remoteAlt; url+="/"+activeProject.git.branches.remoteAlt;
} }
if ($("#sidebar-version-control-repo-toolbar-set-upstream").prop('checked')) { var setUpstream = $("#sidebar-version-control-repo-toolbar-set-upstream").prop('checked');
if (setUpstream) {
url+="?u=true" url+="?u=true"
} }
utils.sendRequest({ utils.sendRequest({
@ -880,6 +884,10 @@ RED.sidebar.versionControl = (function() {
// done(error,null); // done(error,null);
}, },
200: function(data) { 200: function(data) {
if (setUpstream && activeProject.git.branches.remoteAlt) {
activeProject.git.branches.remote = activeProject.git.branches.remoteAlt;
delete activeProject.git.branches.remoteAlt;
}
refresh(true); refresh(true);
closeRemoteBox(); closeRemoteBox();
}, },
@ -928,6 +936,10 @@ RED.sidebar.versionControl = (function() {
// done(error,null); // done(error,null);
}, },
200: function(data) { 200: function(data) {
if (options.setUpstream && activeProject.git.branches.remoteAlt) {
activeProject.git.branches.remote = activeProject.git.branches.remoteAlt;
delete activeProject.git.branches.remoteAlt;
}
refresh(true); refresh(true);
closeRemoteBox(); closeRemoteBox();
}, },