diff --git a/app/controllers/ideaController.js b/app/controllers/ideaController.js
index 2c971cae..f59912ce 100644
--- a/app/controllers/ideaController.js
+++ b/app/controllers/ideaController.js
@@ -60,6 +60,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe
ServiceRepo.ready().then(function () {
$scope.tableParams = $scope.ideaRepo.getTableParams();
+ $scope.featureProposalsTableParams = FeatureProposalRepo.getTableParams();
$scope.resetIdeas = function () {
$scope.resetForms($scope.ideaData);
@@ -195,7 +196,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe
}
}
} else {
- for (var j in $scope.ideasTableParams.data) {
+ for (var j = 0; j < $scope.ideasTableParams.data.length; j++) {
var ij = $scope.ideasTableParams.data[j];
if (!$scope.isSelectedIdea(ij)) {
$scope.selectedIdeas.push(ij);
@@ -238,6 +239,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe
};
$scope.confirmElevateMultiple = function (ideas) {
+ $scope.resetIdeas();
$scope.fpData.ideas = ideas;
$scope.fpData.title = ideas[0].title;
$scope.fpData.description = ideas[0].description;
@@ -246,6 +248,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe
};
$scope.confirmAddIdea = function (idea) {
+ $scope.resetIdeas();
$scope.ideaToAdd = idea;
$scope.openModal('#confirmAddIdeaModal');
};
diff --git a/app/controllers/requestController.js b/app/controllers/requestController.js
index d36a73ff..be02c889 100644
--- a/app/controllers/requestController.js
+++ b/app/controllers/requestController.js
@@ -13,6 +13,9 @@ app.controller('RequestController', function ($controller, $routeParams, $scope,
$scope.requestForm = undefined;
+ //Needs to be an object for ng-disabled
+ $scope.request = {};
+
$scope.services = ServiceRepo.getAll();
var clear = function (type) {
@@ -20,7 +23,7 @@ app.controller('RequestController', function ($controller, $routeParams, $scope,
delete $scope.title;
delete $scope.description;
delete $scope.service;
- $scope.sendUpdates = true;
+ $scope.request.sendUpdates = true;
if ($scope.requestForm) {
$scope.requestForm.$setPristine();
$scope.requestForm.$setUntouched();
@@ -50,7 +53,7 @@ app.controller('RequestController', function ($controller, $routeParams, $scope,
if ($scope.service) {
request.service = $scope.service;
}
- if ($scope.sendUpdates) {
+ if ($scope.request.sendUpdates) {
request.email = $scope.email;
}
ServiceRepo.submitRequest(request).then(function (message) {
diff --git a/app/resources/styles/sass/app.scss b/app/resources/styles/sass/app.scss
index 5ea34c52..ae3c3ca7 100644
--- a/app/resources/styles/sass/app.scss
+++ b/app/resources/styles/sass/app.scss
@@ -15,8 +15,8 @@ $linkColor: #00569f;
body
{
- margin-right: 0!important;
- overflow: hidden;
+ margin-right: 0 !important;
+ padding-right: 0 !important;
}
main {
diff --git a/app/resources/styles/sass/management/_management.scss b/app/resources/styles/sass/management/_management.scss
index 26f0e4c2..84746d3c 100644
--- a/app/resources/styles/sass/management/_management.scss
+++ b/app/resources/styles/sass/management/_management.scss
@@ -96,3 +96,7 @@ thead th span.desc {
.filter-remove:hover {
cursor: pointer;
}
+
+.btn-action {
+ margin-bottom: 6px !important;
+}
diff --git a/app/views/detail/service/ideas.html b/app/views/detail/service/ideas.html
index d0058043..086ea056 100644
--- a/app/views/detail/service/ideas.html
+++ b/app/views/detail/service/ideas.html
@@ -11,11 +11,9 @@
| {{idea.title}} |
{{idea.description}} |
{{idea.lastModified | date : 'medium'}} |
+ {{idea.state | ideaState}} |
-
-
-
-
+
|
@@ -23,6 +21,8 @@
+
+
diff --git a/app/views/management/ideas.html b/app/views/management/ideas.html
index 6e8c0f8a..aea9d0f8 100644
--- a/app/views/management/ideas.html
+++ b/app/views/management/ideas.html
@@ -23,7 +23,6 @@
-
|
@@ -36,6 +35,8 @@
+
+
diff --git a/app/views/modals/detail/service/editIdeaModal.html b/app/views/modals/detail/service/editIdeaModal.html
index 1fd7b8de..257c82bd 100644
--- a/app/views/modals/detail/service/editIdeaModal.html
+++ b/app/views/modals/detail/service/editIdeaModal.html
@@ -32,9 +32,11 @@ Edit Idea
-
-
-
+
+
+
+
+
diff --git a/app/views/request/request.html b/app/views/request/request.html
index 6372420d..48698fe7 100644
--- a/app/views/request/request.html
+++ b/app/views/request/request.html
@@ -46,13 +46,13 @@ Please provide a title and a description for
-
+