Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/config/apiMapping.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ var apiMapping = {
'controller': 'ideas',
'method': 'reject'
},
sendToHelpdesk: {
'endpoint': '/private/queue',
'controller': 'ideas',
'method': 'helpdesk'
},
remove: {
'endpoint': '/private/queue',
'controller': 'ideas',
Expand Down
19 changes: 18 additions & 1 deletion app/controllers/ideaController.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe
$scope.ideaToReject = idea;
};

$scope.rejectIdea = function() {
$scope.rejectIdea = function () {
$scope.updating = true;
$scope.ideaRepo.reject($scope.ideaToReject).then(function(res) {
var result = angular.fromJson(res.body);
Expand All @@ -120,6 +120,23 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe
});
};

$scope.confirmSendToHelpdesk = function (idea) {
$scope.resetIdeas();
$scope.openModal('#sendToHelpdeskModal');
$scope.ideaToSendToHelpdesk = idea;
};

$scope.sendToHelpdesk = function () {
$scope.updating = true;
$scope.ideaRepo.sendToHelpdesk($scope.ideaToSendToHelpdesk).then(function (res) {
if (angular.fromJson(res.body).meta.status === 'SUCCESS') {
$scope.resetIdeas();
$scope.updating = false;
$scope.ideaToSendToHelpdesk = {};
}
});
};

$scope.confirmDelete = function(idea) {
$scope.resetIdeas();
$scope.openModal('#deleteIdeaModal');
Expand Down
7 changes: 7 additions & 0 deletions app/repo/ideaRepo.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ app.repo("IdeaRepo", function IdeaRepo($q, WsApi, Idea, ServiceRepo, TableFactor
return WsApi.fetch(ideaRepo.mapping.reject);
};

ideaRepo.sendToHelpdesk = function (idea) {
angular.extend(ideaRepo.mapping.sendToHelpdesk, {
'data': idea
});
return WsApi.fetch(ideaRepo.mapping.sendToHelpdesk);
};

var safePage = function(resolve) {
ideaRepo.fetchPage().then(function (response) {
var page = angular.fromJson(response.body).payload.PageImpl;
Expand Down
1 change: 1 addition & 0 deletions app/views/management/ideas.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<modal modal-id="deleteIdeaModal" modal-view="views/modals/detail/service/deleteIdeaModal.html" modal-header-class="modal-header-danger" wvr-modal-backdrop="static"></modal>
<modal modal-id="editIdeaModal" modal-view="views/modals/detail/service/editIdeaModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
<modal modal-id="rejectIdeaModal" modal-view="views/modals/detail/service/rejectIdeaModal.html" modal-header-class="modal-header-warning" wvr-modal-backdrop="static"></modal>
<modal modal-id="sendToHelpdeskModal" modal-view="views/modals/detail/service/sendToHelpdeskModal.html" modal-header-class="modal-header-warning" wvr-modal-backdrop="static"></modal>
</weaver-table-modals>

</weaver-table>
Expand Down
3 changes: 2 additions & 1 deletion app/views/modals/detail/service/editIdeaModal.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ <h3 class="modal-title">Edit Idea</h3>
</div>
<div class="row">
<button ng-disabled="updating || ideaData.state === 'ELEVATED'" type="button" class="btn btn-danger pull-left" ng-click="confirmDelete(ideaData)">Delete Idea</button>
<button ng-if="ideaData.state !== 'REJECTED'" ng-disabled="updating || ideaData.state === 'ELEVATED'" type="button" class="btn btn-warning pull-left" ng-click="confirmReject(ideaData)">Reject Idea</button>
<button ng-if="ideaData.state === 'WAITING_ON_REVIEW'" ng-disabled="updating" type="button" class="btn btn-warning pull-left" ng-click="confirmReject(ideaData)">Reject Idea</button>
<button ng-if="ideaData.state === 'WAITING_ON_REVIEW'" ng-disabled="updating" type="button" class="btn btn-warning pull-left" ng-click="confirmSendToHelpdesk(ideaData)">Send to Helpdesk</button>
</div>
<hr>

Expand Down