Hi again Berdir, here the patch and the new issue you asked :)

The patch is 7.x-2.x-dev and sandbox module from michaek.

Comments

berdir’s picture

Status: Active » Needs review

Status: Needs review » Needs work

The last submitted patch, masterchief.patch, failed testing.

berdir’s picture

index d159169..0000000
--- a/LICENSE.txt

--- a/LICENSE.txt
+++ /dev/nullundefined

+++ /dev/nullundefined
@@ -1,339 +0,0 @@

@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE

It looks like you made your patch against a dev snapshot release of Userpoints. You need to use a git checkout or you will see stuff like this.

+++ b/userpoints.infoundefined
@@ -9,10 +9,3 @@ files[]=views/userpoints_views_handler_filter_category.inc
-; Information added by drupal.org packaging script on 2012-03-21
-version = "7.x-2.x-dev"
-core = "7.x"
-project = "userpoints"

Same here. The patch won't apply because these lines don't exist in a git checkout.

+++ b/userpoints.moduleundefined
@@ -487,11 +491,13 @@ function userpoints_tokens($type, $tokens, array $data = array(), array $options
+          $replacements[$original] = theme('userpoints_points', array('points'=>$points));

Should have a space before and after =>, some for all instances below.

MasterChief’s picture

Status: Needs work » Needs review
StatusFileSize
new13.38 KB

Ok new patch :)

Status: Needs review » Needs work

The last submitted patch, masterchiefv2.patch, failed testing.

berdir’s picture

+++ b/userpoints.infoundefined
@@ -9,10 +9,3 @@ files[]=views/userpoints_views_handler_filter_category.inc
-
-; Information added by drupal.org packaging script on 2012-03-21
-version = "7.x-2.x-dev"
-core = "7.x"
-project = "userpoints"
-datestamp = "1332290820"

This part is still here, you need to remove the changes in the .info files or it won't apply.

I can commit this change once you fixed this and then you can continue with your patch on top of this one.

MasterChief’s picture

Status: Needs work » Needs review
StatusFileSize
new11.95 KB

I think it will be good now :)

berdir’s picture

Status: Needs review » Fixed

Yes, looks good.

I think we're missing a few places where the function isn't yet used, liked services and views integration. However, we fix these as we find them and views integration is going to be overhauled completely based on entity API anyway.

Thanks, commited.

IWasBornToWin’s picture

Masterchief,

Does this have anything to do with the new patch I just paid you to do? Is that patch committed to the latest user points dev yet?

Thanks

IWasBornToWin’s picture

Berdir/Materchief? Is new userpoints with decimals patch committed to dev version yet? Thanks

MasterChief’s picture

Not yet, i am waiting an answer from Berdir on the other issue, but you can use the version i sent you, you have all the new features minus the patch on this issue queue but it doesn't change anything for you as an user :)

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.