Skip to content

Commit 4cba6ac

Browse files
author
Christoph Wolfes
committed
fixed custom query selection
1 parent ef1c7b0 commit 4cba6ac

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

src/main/issues/edit/edit.html

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<form role="form">
2-
<div class="form-group">
3-
<label for="project">Project</label>
4-
<select name="project" id="project" required="true" class="form-control" ng-model="config.project">
5-
<option value="" disabled>Select a project</option>
6-
<option ng-repeat="project in vm.projects | orderBy: 'name'" value="{{project.id}}">{{project.name}}</option>
7-
</select>
8-
</div>
9-
<div class="form-group">
10-
<label for="customQuery">My Custom-Queries</label>
11-
<select name="customQuery" id="customQuery" required="true" class="form-control" ng-model="config.customQuery">
2+
<div class="form-group">
3+
<label >My Custom-Queries</label>
4+
<select name="customQuery" ng-options="customQuery as customQuery.name for customQuery
5+
in vm.customQueries track by customQuery.name" required="true" class="form-control" ng-model="config.customQuery">
126
<option value="" disabled>Select your query</option>
13-
<option ng-repeat="customQuery in vm.customQueries| orderBy: 'name'" value="{{customQuery.id}}">{{customQuery.name}}</option>
147
</select>
158
</div>
169
<div class="form-group">
@@ -20,7 +13,7 @@
2013
Show closed issues
2114
</div>
2215
<div class="form-group">
23-
<label for="project">Columns to show:</label>
16+
<label >Columns to show:</label>
2417
<li class="list-group-item" ng-repeat="(key, entry) in vm.possibleColumns">
2518
<input type="checkbox"
2619
name={{key}}

src/main/issues/edit/editIssuesController.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ angular.module('adf.widget.redmine')
2121
}
2222
});
2323

24+
2425
if(angular.equals({},config)) {
2526
config.columns=vm.possibleColumns;
2627
config.project='';

src/main/redmine.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ angular.module('adf.widget.redmine', ['adf.provider', 'chart.js', 'ui.bootstrap.
4040
resolve: {
4141
/** @ngInject **/
4242
issues: function (redmineService, config) {
43-
if(config.customQuery && config.project){
44-
return redmineService.getIssuesByQueryId(config.customQuery, config.project);
43+
if(config.customQuery){
44+
return redmineService.getIssuesByQueryId(config.customQuery.id, config.customQuery.project_id);
4545
}
4646

4747
}

0 commit comments

Comments
 (0)