SONAR-6834 Rename column CE_ACTIVITY.FINISHED_AT to EXECUTED_AT

8 files changed, 11 insertions, 11 deletions

diff --git a/server/sonar-web/src/main/js/apps/background-tasks/main.js b/server/sonar-web/src/main/js/apps/background-tasks/main.js
index cdc56585af1..ddffd8d8831 100644
--- a/server/sonar-web/src/main/js/apps/background-tasks/main.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/main.js
@@ -57,7 +57,7 @@ export default React.createClass({
           filter.minSubmittedAt = moment(this.state.minDate).format(DATE_FORMAT);
         }
         if (this.state.maxDate) {
-          filter.maxFinishedAt = moment(this.state.maxDate).format(DATE_FORMAT);
+          filter.maxExecutedAt = moment(this.state.maxDate).format(DATE_FORMAT);
         }
         break;
       default:
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/tasks.js b/server/sonar-web/src/main/js/apps/background-tasks/tasks.js
index 2b347e2b24e..9e0e6b33e9b 100644
--- a/server/sonar-web/src/main/js/apps/background-tasks/tasks.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/tasks.js
@@ -110,7 +110,7 @@ export default React.createClass({
           {this.renderTaskDay(task, previousTask)}
           {this.renderTaskDate(task, 'submittedAt', 'LTS')}
           {this.renderTaskDate(task, 'startedAt', 'LTS')}
-          {this.renderTaskDate(task, 'finishedAt', 'LTS')}
+          {this.renderTaskDate(task, 'executedAt', 'LTS')}
           {this.renderTaskExecutionTime(task)}
           <td className="thin nowrap text-right">
             {this.renderLogsLink(task)}
diff --git a/server/sonar-web/src/main/js/apps/computation/report.js b/server/sonar-web/src/main/js/apps/computation/report.js
index a8bbec66824..3dec4d50324 100644
--- a/server/sonar-web/src/main/js/apps/computation/report.js
+++ b/server/sonar-web/src/main/js/apps/computation/report.js
@@ -7,7 +7,7 @@ export default Backbone.Model.extend({
     var duration = null;
     if (this.has('startedAt')) {
       var startedAtMoment = moment(this.get('startedAt')),
-          finishedAtMoment = moment(this.get('finishedAt') || new Date()),
+          finishedAtMoment = moment(this.get('executedAt') || new Date()),
           diff = finishedAtMoment.diff(startedAtMoment);
       duration = {
         seconds: Math.floor(diff / 1000) % 60,
diff --git a/server/sonar-web/src/main/js/apps/computation/templates/computation-list-item.hbs b/server/sonar-web/src/main/js/apps/computation/templates/computation-list-item.hbs
index 85465a1b5cb..dcc4feb1bfc 100644
--- a/server/sonar-web/src/main/js/apps/computation/templates/computation-list-item.hbs
+++ b/server/sonar-web/src/main/js/apps/computation/templates/computation-list-item.hbs
@@ -11,8 +11,8 @@
     {{#if startedAt}}
       <li>Started: {{dt startedAt}}</li>
     {{/if}}
-    {{#if finishedAt}}
-      <li>Finished: {{dt finishedAt}}</li>
+    {{#if executedAt}}
+      <li>Executed: {{dt executedAt}}</li>
     {{/if}}
   </ul>
 </div>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/931_create_ce_activity.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/931_create_ce_activity.rb
index 88e5fa87c18..55a6e90fe77 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/931_create_ce_activity.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/931_create_ce_activity.rb
@@ -33,7 +33,7 @@ class CreateCeActivity < ActiveRecord::Migration
       t.column 'submitter_login', :string, :limit => 255, :null => true
       t.column 'submitted_at', :big_integer, :null => false
       t.column 'started_at', :big_integer, :null => true
-      t.column 'finished_at', :big_integer, :null => true
+      t.column 'executed_at', :big_integer, :null => true
       t.column 'created_at', :big_integer, :null => false
       t.column 'updated_at', :big_integer, :null => false
       t.column 'execution_time_ms', :big_integer, :null => true
diff --git a/server/sonar-web/test/json/computation-spec/history-big-1.json b/server/sonar-web/test/json/computation-spec/history-big-1.json
index d0cb80fa1a8..2007319f5e8 100644
--- a/server/sonar-web/test/json/computation-spec/history-big-1.json
+++ b/server/sonar-web/test/json/computation-spec/history-big-1.json
@@ -14,7 +14,7 @@
       "status": "SUCCESS",
       "submittedAt": "2015-09-18T11:20:43+0200",
       "startedAt": "2015-09-18T11:20:37+0200",
-      "finishedAt": "2015-09-18T11:20:43+0200",
+      "executedAt": "2015-09-18T11:20:43+0200",
       "executionTimeMs": 6030
     },
     {
@@ -26,7 +26,7 @@
       "status": "SUCCESS",
       "submittedAt": "2015-09-18T11:16:56+0200",
       "startedAt": "2015-09-18T11:16:47+0200",
-      "finishedAt": "2015-09-18T11:16:56+0200",
+      "executedAt": "2015-09-18T11:16:56+0200",
       "executionTimeMs": 8671
     }
   ]
diff --git a/server/sonar-web/test/json/computation-spec/history-big-2.json b/server/sonar-web/test/json/computation-spec/history-big-2.json
index 08c000455b8..82bb0687ca6 100644
--- a/server/sonar-web/test/json/computation-spec/history-big-2.json
+++ b/server/sonar-web/test/json/computation-spec/history-big-2.json
@@ -14,7 +14,7 @@
       "status": "SUCCESS",
       "submittedAt": "2015-09-18T11:16:56+0200",
       "startedAt": "2015-09-18T11:16:47+0200",
-      "finishedAt": "2015-09-18T11:16:56+0200",
+      "executedAt": "2015-09-18T11:16:56+0200",
       "executionTimeMs": 8671
     }
   ]
diff --git a/server/sonar-web/test/json/computation-spec/history.json b/server/sonar-web/test/json/computation-spec/history.json
index 285e15a7301..2aa4f0265f9 100644
--- a/server/sonar-web/test/json/computation-spec/history.json
+++ b/server/sonar-web/test/json/computation-spec/history.json
@@ -14,7 +14,7 @@
       "status": "SUCCESS",
       "submittedAt": "2015-09-18T11:20:43+0200",
       "startedAt": "2015-09-18T11:20:37+0200",
-      "finishedAt": "2015-09-18T11:20:43+0200",
+      "executedAt": "2015-09-18T11:20:43+0200",
       "executionTimeMs": 6030
     },
     {
@@ -26,7 +26,7 @@
       "status": "SUCCESS",
       "submittedAt": "2015-09-18T11:16:56+0200",
       "startedAt": "2015-09-18T11:16:47+0200",
-      "finishedAt": "2015-09-18T11:16:56+0200",
+      "executedAt": "2015-09-18T11:16:56+0200",
       "executionTimeMs": 8671
     }
   ]