Commit 9d2d9dfd authored by Bonita CI's avatar Bonita CI

Merge branch 'master' into 'dev'

parents f11b2770 e2d181bb
......@@ -9,7 +9,7 @@
<ul class="dropdown-menu" role="menu">
<li ng-click="filterCtrl.selectApp(defaultFilters.appName, defaultFilters.appName)"><a>{{defaultFilters.appName | translate}}</a></li>
<li ng-if="appNames &amp;&amp; appNames.length>0" class="divider"></li>
<li ng-repeat="appName in appNames" ng-click="filterCtrl.selectApp(appName[0], appName[1])"><a>{{appName[0]}} ({{appName[1]}})</a></li>
<li ng-repeat="appName in appNames" ng-click="filterCtrl.selectApp(appName[0], appName[1])"><a>{{appName[0]}}<span ng-if="appName[1] !== appName[0]"> ({{appName[1] | translate}})</span></a></li>
</ul>
</div>
</span>
......
......@@ -4,11 +4,11 @@
<div class="col-md-9">
<span class="button-filter">{{'Process' | translate}} <span id="infoPopover" class="glyphicon glyphicon-info-sign" popover="{{'This filters the case list only by process name. The display name is shown for information purposes. ' | translate}}" popover-trigger="mouseenter"></span>
<div class="btn-group" dropdown id="case-app-name-filter">
<button type="button" dropdown-toggle class="btn btn-primary dropdown-toggle">{{selectedFilters.selectedApp[0] | translate}} <span ng-if="selectedFilters.selectedApp[0] !== defaultFilters.appName">({{selectedFilters.selectedApp[1] | translate}})</span> <span class="caret"></span></button>
<button type="button" dropdown-toggle class="btn btn-primary dropdown-toggle">{{selectedFilters.selectedApp[1] | translate}} <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<li ng-click="filterCtrl.selectApp(defaultFilters.appName, defaultFilters.appName)"><a>{{defaultFilters.appName | translate}}</a></li>
<li ng-if="appNames &amp;&amp; appNames.length>0" class="divider"></li>
<li ng-repeat="appName in appNames" ng-click="filterCtrl.selectApp(appName[0], appName[1])"><a>{{appName[1]}}</a></li>
<li ng-repeat="appName in appNames" ng-click="filterCtrl.selectApp(appName[0], appName[1])"><a>{{appName[0]}}<span ng-if="appName[1] !== appName[0]"> ({{appName[1] | translate}})</span></a></li>
</ul>
</div>
</span>
......
......@@ -51,8 +51,8 @@
</td>
<td class="text-right case-detail"><a id="case-detail-link-{{case.id}}" target="_parent" href="{{::caseCtrl.getLinkToCase(case)}}">{{case['ID']}}</a></td>
<td class="case-detail"><a id="case-process-link-{{case.id}}" target="_parent" href="{{::caseCtrl.getLinkToProcess(case)}}">{{case.processDefinitionId.name}}</a></td>
<td class="case-detail"><a id="case-process-link-{{case.id}}" target="_parent" href="{{::caseCtrl.getLinkToProcess(case)}}">{{case.processDefinitionId.displayName}}</a></td>
<td class="case-detail"><a id="case-process-link-{{case.id}}" target="_parent" href="{{::caseCtrl.getLinkToProcess(case)}}">{{case.processDefinitionId.name}}</a></td>
<td class="case-detail"><a id="case-process-display-name-link-{{case.id}}" target="_parent" href="{{::caseCtrl.getLinkToProcess(case)}}">{{case.processDefinitionId.displayName}}</a></td>
<td class="case-detail">{{::case['Version']}}</td>
<td class="case-detail">{{::caseCtrl.parseAndFormat(case['Start date'])}}</td>
<td class="case-detail" title="{{'username:' | translate}} {{::case['Started by'] || ('System' | translate)}}">{{::case['Started by fullname'] || ('System' | translate)}}</td>
......@@ -127,7 +127,7 @@
<td class="case-detail text-right"><a id="case-detail-link-{{case.id}}" target="_parent" href="{{::caseCtrl.getLinkToCase(case)}}">{{case['ID']}}</a></td>
<td class="case-detail"><a id="case-process-link-{{case.id}}" target="_parent" href="{{::caseCtrl.getLinkToProcess(case)}}">{{case.processDefinitionId.name}}</a></td>
<td class="case-detail"><a id="case-process-link-{{case.id}}" target="_parent" href="{{::caseCtrl.getLinkToProcess(case)}}">{{case.processDefinitionId.displayName}}</a></td>
<td class="case-detail"><a id="case-process-display-name-link-{{case.id}}" target="_parent" href="{{::caseCtrl.getLinkToProcess(case)}}">{{case.processDefinitionId.displayName}}</a></td>
<td class="case-detail">{{::case['Version']}}</td>
<td class="case-detail">{{::caseCtrl.parseAndFormat(case['Start date'])}}</td>
<td class="case-detail" title="{{'username:' | translate}} {{::case['Started by'] || ('System' | translate)}}">{{::case['Started by fullname'] || ('System' | translate)}}</td>
......
[
{
"id": "7626384556180392799",
"icon": "",
"displayDescription": "",
"deploymentDate": "2014-10-17 16:04:50.393",
"description": "",
"activationState": "ENABLED",
"name": "Pool",
"deployedBy": "4",
"displayName": "Pool",
"actorinitiatorid": "1",
"last_update_date": "2014-10-17 16:04:52.247",
"configurationState": "RESOLVED",
"version": "1.0",
"failedCases": "2",
"openCases": "3"
}
]
[
{
"id": "4910683075061293406",
"icon": "",
"displayDescription": "",
"deploymentDate": "2014-10-20 10:07:13.762",
"description": "",
"activationState": "ENABLED",
"name": "ProcessX",
"deployedBy": "4",
"displayName": "ProcessX",
"actorinitiatorid": "103",
"last_update_date": "2014-10-20 10:07:15.595",
"configurationState": "RESOLVED",
"version": "2.0",
"failedCases": "10",
"openCases": "45"
},
{
"id": "9106502070759678545",
"icon": "",
"displayDescription": "",
"deploymentDate": "2014-10-20 10:06:56.778",
"description": "",
"activationState": "ENABLED",
"name": "Poule",
"deployedBy": "4",
"displayName": "Poule",
"actorinitiatorid": "101",
"last_update_date": "2014-10-20 10:06:58.327",
"configurationState": "RESOLVED",
"version": "1.1",
"failedCases": "1",
"openCases": "0"
},
{
"id": "8967858817451251940",
"icon": "",
"displayDescription": "",
"deploymentDate": "2014-10-20 10:07:05.328",
"description": "",
"activationState": "ENABLED",
"name": "Poule",
"deployedBy": "4",
"displayName": "Poule",
"actorinitiatorid": "102",
"last_update_date": "2014-10-20 10:07:06.861",
"configurationState": "RESOLVED",
"version": "2.0",
"failedCases": "0",
"openCases": "0"
},
{
"id": "7626384556180392799",
"icon": "",
"displayDescription": "",
"deploymentDate": "2014-10-17 16:04:50.393",
"description": "",
"activationState": "ENABLED",
"name": "Pool",
"deployedBy": "4",
"displayName": "Pool",
"actorinitiatorid": "1",
"last_update_date": "2014-10-17 16:04:52.247",
"configurationState": "RESOLVED",
"version": "1.0",
"failedCases": "2",
"openCases": "3"
}
]
......@@ -239,6 +239,10 @@
when('GET', /^\/API\/bpm\/process\/(8007855270751208272)$/).respond(require('./user/tasks/list/process8007855270751208272-mock.json'));
//global
when('GET', /^\/API\/bpm\/process\?c=\d+&n=openCases&n=failedCases&o=displayName\+ASC&p=0$/).respond(require('./admin/cases/list/process-def-4.json'));
when('GET', /^\/API\/bpm\/process\?c=\d+&n=openCases&n=failedCases&o=displayName\+DESC&p=0$/).respond(require('./admin/cases/list/process-def-4-ordered-by-process-name.json'));
when('GET', /^\/API\/bpm\/process\?c=\d+&f=displayName%3DPool&.*p=0$/).respond(require('./admin/cases/list/process-def-4-filtered-by-pool-display-name.json'));
when('GET', /^\/API\/bpm\/process\?c=\d+&.*p=0$/).respond(require('./admin/cases/list/process-def-4.json'));
when('GET', /^\/API\/bpm\/process\?c=\d+&.*p=0&.*s=.*$/).respond(require('./admin/cases/list/process-def-4.json'));
when('GET', /^\/API\/system\/i18ntranslation.*$/).respond([]);
......
......@@ -74,7 +74,7 @@
appNamesFilter.all(by.css('ul')).each(function(column){
expect(column.isDisplayed()).toBeFalsy();
});
expect(appNamesFilter.all(by.css('button')).getText()).toEqual(['Poule (Poule)']);
expect(appNamesFilter.all(by.css('button')).getText()).toEqual(['Poule']);
element.all(by.xpath('//tbody//td[3]')).each(function(appNameColumn){
expect(appNameColumn.getText()).toBe('Poule');
});
......@@ -91,7 +91,7 @@
var appFilterButton = caseFilters.all(by.css('#case-app-name-filter button'));
appFilterButton.click();
appNamesFilter.all(by.css('ul li')).get(4).click();
expect(appNamesFilter.all(by.css('button')).getText()).toEqual(['ProcessX (ProcessX)']);
expect(appNamesFilter.all(by.css('button')).getText()).toEqual(['ProcessX']);
element.all(by.xpath('//tbody//td[3]')).each(function(appNameColumn){
expect(appNameColumn.getText()).toBe('ProcessX');
});
......@@ -125,7 +125,7 @@
var appNamesFilterButton = caseFilters.all(by.css('#case-app-name-filter button'));
appNamesFilterButton.click();
appNamesFilter.all(by.css('ul li')).get(3).click();
expect(appNamesFilter.all(by.css('button')).getText()).toEqual(['Poule (Poule)']);
expect(appNamesFilter.all(by.css('button')).getText()).toEqual(['Poule']);
var versionFilter = caseFilters.all(by.css('#case-app-version-filter'));
var versionFilterButton = caseFilters.all(by.css('#case-app-version-filter button'));
expect(versionFilter.getText()).toEqual(['All']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment