Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-07 05:45:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: https://forums.cyberpanel.net/discussion/comment/9482/#Comment_9482

Browse Source
This commit is contained in:
Usman Nasir
2020-05-09 00:07:56 +05:00
parent 97ae6eca28
commit 157da73ae2
3 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
static/websiteFunctions/websiteFunctions.js
View File

@@ -5836,7 +5836,7 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
$scope.autoCommitCurrent = response.data.autoCommitCurrent;
$scope.autoPushCurrent = response.data.autoPushCurrent;
$scope.emailLogsCurrent = response.data.emailLogsCurrent;
$scope.currentCommands = response.data.commands;
document.getElementById("currentCommands").value = response.data.commands;
$scope.webhookCommandCurrent = response.data.webhookCommandCurrent;
} else {
$scope.gitTracking = false;
@@ -6677,17 +6677,40 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
url = "/websites/saveGitConfigurations";
var data = {
domain: $("#domain").text(),
folder: $scope.folder,
autoCommit: $scope.autoCommit,
autoPush: $scope.autoPush,
emailLogs: $scope.emailLogs,
commands: $scope.commands,
commands: document.getElementById("currentCommands").value,
webhookCommand: $scope.webhookCommand
};
if ($scope.autoCommit === undefined){
$scope.autoCommitCurrent = 'Never';
}else{
$scope.autoCommitCurrent = $scope.autoCommit;
}
if ($scope.autoPush === undefined){
$scope.autoPushCurrent = 'Never';
}else{
$scope.autoPushCurrent = $scope.autoPush;
}
if ($scope.emailLogs === undefined){
$scope.emailLogsCurrent = false;
}else{
$scope.emailLogsCurrent = $scope.emailLogs;
}
if ($scope.webhookCommand === undefined){
$scope.webhookCommandCurrent = false;
}else{
$scope.webhookCommandCurrent = $scope.webhookCommand;
}
var config = {
headers: {
'X-CSRFToken': getCookie('csrftoken')

29
websiteFunctions/static/websiteFunctions/websiteFunctions.js
View File

@@ -5836,7 +5836,7 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
$scope.autoCommitCurrent = response.data.autoCommitCurrent;
$scope.autoPushCurrent = response.data.autoPushCurrent;
$scope.emailLogsCurrent = response.data.emailLogsCurrent;
$scope.currentCommands = response.data.commands;
document.getElementById("currentCommands").value = response.data.commands;
$scope.webhookCommandCurrent = response.data.webhookCommandCurrent;
} else {
$scope.gitTracking = false;
@@ -6677,17 +6677,40 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
url = "/websites/saveGitConfigurations";
var data = {
domain: $("#domain").text(),
folder: $scope.folder,
autoCommit: $scope.autoCommit,
autoPush: $scope.autoPush,
emailLogs: $scope.emailLogs,
commands: $scope.commands,
commands: document.getElementById("currentCommands").value,
webhookCommand: $scope.webhookCommand
};
if ($scope.autoCommit === undefined){
$scope.autoCommitCurrent = 'Never';
}else{
$scope.autoCommitCurrent = $scope.autoCommit;
}
if ($scope.autoPush === undefined){
$scope.autoPushCurrent = 'Never';
}else{
$scope.autoPushCurrent = $scope.autoPush;
}
if ($scope.emailLogs === undefined){
$scope.emailLogsCurrent = false;
}else{
$scope.emailLogsCurrent = $scope.emailLogs;
}
if ($scope.webhookCommand === undefined){
$scope.webhookCommandCurrent = false;
}else{
$scope.webhookCommandCurrent = $scope.webhookCommand;
}
var config = {
headers: {
'X-CSRFToken': getCookie('csrftoken')

8
websiteFunctions/templates/websiteFunctions/manageGIT.html
View File

@@ -189,8 +189,7 @@
<option>Weekly</option>
</select>
</div>
<div class="current-pack ng-binding">Currently: {$ autoCommitCurrent
$}
<div class="current-pack ng-binding">Currently: {$ autoCommitCurrent $}
</div>
</div>
@@ -234,10 +233,9 @@
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Commands" %}</label>
<div class="col-sm-9">
<textarea ng-model="$parent.commands"
placeholder="Add Commands to run after every commit, each line must contain one command only."
<textarea id="currentCommands"
rows="4"
class="form-control">{$ currentCommands $}</textarea>
class="form-control"></textarea>
</div>
</div>