← Back to team overview

gtg team mailing list archive

[Merge] lp:~parinporecha/gtg/love_patches into lp:gtg

 

Parin Porecha has proposed merging lp:~parinporecha/gtg/love_patches into lp:gtg.

Requested reviews:
  Gtg developers (gtg)

For more details, see:
https://code.launchpad.net/~parinporecha/gtg/love_patches/+merge/142915

This is a patch for the Bug #1095390 ( Quick Add bar incorrectly parses tags ).
It was caused due to different regexes used in quick add bar and editor.
I have replaced the quick add bar regex with the editor one.
Now, the tags containing '-' and ':' will be detected whole :)
-- 
https://code.launchpad.net/~parinporecha/gtg/love_patches/+merge/142915
Your team Gtg developers is requested to review the proposed merge of lp:~parinporecha/gtg/love_patches into lp:gtg.
=== modified file 'CHANGELOG'
--- CHANGELOG	2013-01-10 15:51:33 +0000
+++ CHANGELOG	2013-01-11 15:20:28 +0000
@@ -8,6 +8,8 @@
     * Fix for bug #1039651: Urgency coloring of parent tasks in collapsed view, by Parin Porecha
     * Fix for bug #1032745: Calendar widget is padded to always be visible on the screen
     * Russian localization of help by DmDr
+    * Fix for bug #1096622: Damaged image in the help, by Parin Porecha
+    * Fix for bug #1095390: Quick Add bar incorrectly parses tags, by Parin Porecha
 
 2012-11-06 Getting Things GNOME! 0.3
     * Hide tasks with due date someday, #931376

=== modified file 'GTG/core/task.py'
--- GTG/core/task.py	2012-11-27 16:53:42 +0000
+++ GTG/core/task.py	2013-01-11 15:20:28 +0000
@@ -148,7 +148,7 @@
         defer_date = Date.no_date()
         if text:
             # Get tags in the title
-            for match in re.findall(r'(?:^|[\s])(@\w+)', text, re.UNICODE):
+            for match in re.findall(r'(?:^|[\s])(@[\w\/\.\-\:]*\w)', text, re.UNICODE):
                 tags.append(match)
             # Get attributes
             regexp = r'([\s]*)([\w-]+):\s*([^\s]+)'

=== modified file 'GTG/tools/tags.py'
--- GTG/tools/tags.py	2012-11-25 19:19:44 +0000
+++ GTG/tools/tags.py	2013-01-11 15:20:28 +0000
@@ -22,7 +22,7 @@
 
 def extract_tags_from_text(text):
     """ Given a string, returns a list of the @tags contained in that """
-    return re.findall(r'(?:^|[\s])(@[\w\/\.\-]*\w)', text)
+    return re.findall(r'(?:^|[\s])(@[\w\/\.\-\:]*\w)', text)
 
 
 def parse_tag_list(text):