Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #15178: In technique editor, deleting a new technique crashes #1100

Merged
merged 1 commit into from Nov 14, 2019
Merged

Fixes #15178: In technique editor, deleting a new technique crashes #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion builder/index.html
View file
Open in desktop
Expand Up @@ -218,7 +218,7 @@ <h3 id="technique-name">{{originalTechnique.name}} <span ng-hide="originalTechni
<li>
<a ng-disabled="isNotSaved()" class="action-primary" ng-click="exportTechnique(selectedTechnique)">Export <i class="fas fa-file-export"></i></a>
</li>
<li>
<li ng-hide="originalTechnique.bundle_name===undefined">
<a ng-disabled="isNotSaved()" class="action-danger" ng-click="confirmPopup('Delete','Technique', deleteTechnique, selectedTechnique, selectedTechnique.name)">Delete <i class="fas fa-times-circle"></i></a>
</li>
</ul>
Expand Down
5 changes: 1 addition & 4 deletions builder/js/ncf.js
View file
Open in desktop
Expand Up @@ -603,9 +603,7 @@ $scope.onImportFileChange = function (fileEl) {
// Click on a Technique
// Select it if it was not selected, unselect it otherwise
$scope.selectTechnique = function(technique) {
$scope.restoreFlag = false;
$scope.suppressFlag = false;
$scope.conflictFlag = false;
$scope.resetFlags();
// Always clean Selected methods and display methods list
$scope.selectedMethod = undefined;
// Check if that technique is the same as the original selected one
Expand Down Expand Up @@ -1354,7 +1352,6 @@ $scope.onImportFileChange = function (fileEl) {
});

var confirmModalCtrl = function ($scope, $uibModalInstance, actionName, kind, name) {

$scope.actionName = actionName;
$scope.kind = kind;
$scope.name = name;
Expand Down