You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/01/06 22:34:41 UTC
[2/2] git commit: updated refs/heads/master to 4e9335e
Change for showing progress in active tasks. Show docs written instead
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4e9335e0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4e9335e0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4e9335e0
Branch: refs/heads/master
Commit: 4e9335e0a2463ddf19aeef02fde18d0c5ae209f3
Parents: 94a4a73
Author: suelockwood <de...@apache.org>
Authored: Mon Jan 6 16:34:30 2014 -0500
Committer: suelockwood <de...@apache.org>
Committed: Mon Jan 6 16:34:30 2014 -0500
----------------------------------------------------------------------
src/fauxton/app/addons/activetasks/templates/tabledetail.html | 4 ----
src/fauxton/app/addons/activetasks/views.js | 7 ++++++-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4e9335e0/src/fauxton/app/addons/activetasks/templates/tabledetail.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/activetasks/templates/tabledetail.html b/src/fauxton/app/addons/activetasks/templates/tabledetail.html
index 67c0dc8..3f5e6c4 100644
--- a/src/fauxton/app/addons/activetasks/templates/tabledetail.html
+++ b/src/fauxton/app/addons/activetasks/templates/tabledetail.html
@@ -28,9 +28,5 @@ the License.
<%= model.get("pid")%>
</td>
<td>
- <div class="progress progress-striped active">
- <div class="bar" style="width: <%=model.get("progress")%>%;"><%=model.get("progress")%>%</div>
-
- </div>
<p><%=progress%> </p>
</td>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4e9335e0/src/fauxton/app/addons/activetasks/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/activetasks/views.js b/src/fauxton/app/addons/activetasks/views.js
index 005d487..2b2effc 100644
--- a/src/fauxton/app/addons/activetasks/views.js
+++ b/src/fauxton/app/addons/activetasks/views.js
@@ -162,7 +162,12 @@ function (app, FauxtonAPI, activetasks) {
getProgress: function(){
var progress = "";
if (this.type === "indexer"){
- progress = "Processed " +this.model.get('changes_done')+ " of "+this.model.get('total_changes')+ ' changes';
+ progress = "Processed " +this.model.get('changes_done')+ " of "+this.model.get('total_changes')+ ' changes.';
+ } else if (this.type === "replication"){
+ progress = this.model.get('docs_written')+ " docs written. ";
+ if (this.model.get('changes_pending') !== null) {
+ progress += this.model.get('changes_pending')+' pending changes.';
+ }
}
return progress;
},