You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/06/03 18:48:04 UTC

[1/3] git commit: [#6319] Bump EW version

Updated Branches:
  refs/heads/master e31e54947 -> 4caff7c49


[#6319] Bump EW version

Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/73f84edc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/73f84edc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/73f84edc

Branch: refs/heads/master
Commit: 73f84edc952a8868c29dd21a74432d399714ee02
Parents: e31e549
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Mon Jun 3 14:55:58 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Mon Jun 3 16:46:37 2013 +0000

----------------------------------------------------------------------
 requirements-common.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/73f84edc/requirements-common.txt
----------------------------------------------------------------------
diff --git a/requirements-common.txt b/requirements-common.txt
index a105ba2..445d8be 100644
--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -10,7 +10,7 @@ Creoleparser==0.7.3
 decorator==3.3.2
 # dep of pypeline
 docutils==0.8.1
-EasyWidgets==0.2dev-20130116
+EasyWidgets==0.2dev-20130603
 faulthandler==2.1
 feedparser==5.0.1
 FormEncode==1.2.4


[2/3] git commit: [#6307] do exact match instead of substring match on search bin & milestone names

Posted by tv...@apache.org.
[#6307] do exact match instead of substring match on search bin & milestone names


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/dafd0e9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/dafd0e9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/dafd0e9c

Branch: refs/heads/master
Commit: dafd0e9c3d257ef8f3f9a3bf6bc1218940dc37ec
Parents: 73f84ed
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Thu May 30 19:19:11 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Mon Jun 3 16:47:16 2013 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/tracker_main.py |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dafd0e9c/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 7fbbe9c..223911b 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -311,11 +311,13 @@ class ForgeTrackerApp(Application):
             $.ajax({
                 url:'%(app_url)sbin_counts',
                 success: function(data) {
+                    var $spans = $('.search_bin > span');
                     $.each(data.bin_counts, function(i, item) {
-                        var $span = $('.search_bin span:contains("' + item.label + '")');
-                        if ($span) {
-                            $span.after('<small>' + item.count + '</small>').fadeIn('fast');
-                        }
+                        $spans.each(function(){
+                            if ($(this).text() == item.label) {
+                                $(this).after('<small>' + item.count + '</small>').fadeIn('fast');
+                            }
+                        });
                     });
                 }
             });
@@ -323,11 +325,13 @@ class ForgeTrackerApp(Application):
                 $.ajax({
                     url: '%(app_url)smilestone_counts',
                     success: function(data) {
+                        var $spans = $('.milestones > span');
                         $.each(data.milestone_counts, function(i, item) {
-                            var $span = $('.milestones span:contains("' + item.name + '")');
-                            if ($span) {
-                                $span.after('<small>' + item.count + '</small>').fadeIn('fast');
-                            }
+                            $spans.each(function(){
+                                if ($(this)) {
+                                    $(this).after('<small>' + item.count + '</small>').fadeIn('fast');
+                                }
+                            });
                         });
                     }
                 });


[3/3] git commit: [#6307] Only update milestone with matching name

Posted by tv...@apache.org.
[#6307] Only update milestone with matching name

Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4caff7c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4caff7c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4caff7c4

Branch: refs/heads/master
Commit: 4caff7c4961f346fd0a9ffef21aeea81179a42ac
Parents: dafd0e9
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Mon Jun 3 16:45:38 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Mon Jun 3 16:47:16 2013 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/tracker_main.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4caff7c4/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 223911b..aabf321 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -313,8 +313,8 @@ class ForgeTrackerApp(Application):
                 success: function(data) {
                     var $spans = $('.search_bin > span');
                     $.each(data.bin_counts, function(i, item) {
-                        $spans.each(function(){
-                            if ($(this).text() == item.label) {
+                        $spans.each(function() {
+                            if ($(this).text() === item.label) {
                                 $(this).after('<small>' + item.count + '</small>').fadeIn('fast');
                             }
                         });
@@ -327,8 +327,8 @@ class ForgeTrackerApp(Application):
                     success: function(data) {
                         var $spans = $('.milestones > span');
                         $.each(data.milestone_counts, function(i, item) {
-                            $spans.each(function(){
-                                if ($(this)) {
+                            $spans.each(function() {
+                                if ($(this).text() === item.name) {
                                     $(this).after('<small>' + item.count + '</small>').fadeIn('fast');
                                 }
                             });