summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuda Dornelles <dudassdornelles@gmail.com>2015-01-27 16:26:01 -0200
committerPixpoa pairing <pixpoapairing@pixelated-project.org>2015-01-27 16:26:01 -0200
commita211149d2a1bdf21b970cdff1bd5a31a9ecdadaf (patch)
tree01ee96303bb438e2acfeada4324f98dd1939f4fa
parent2f25e6429d9d846632314d093591ad413fac0d9e (diff)
#184 not creating empty tags of any length (as opposed to only empty strings with len==0)
-rw-r--r--service/pixelated/resources/mail_resource.py2
-rw-r--r--service/test/integration/test_tags.py2
-rw-r--r--web-ui/app/js/mail_view/ui/mail_view.js2
-rw-r--r--web-ui/test/spec/mail_view/ui/mail_view.spec.js2
4 files changed, 4 insertions, 4 deletions
diff --git a/service/pixelated/resources/mail_resource.py b/service/pixelated/resources/mail_resource.py
index 396ccd74..fd1d255f 100644
--- a/service/pixelated/resources/mail_resource.py
+++ b/service/pixelated/resources/mail_resource.py
@@ -15,7 +15,7 @@ class MailTags(Resource):
def render_POST(self, request):
content_dict = json.loads(request.content.read())
- new_tags = [x.lower() for x in content_dict['newtags'] if x != '']
+ new_tags = [x.lower() for x in map(lambda e: e.strip(), content_dict['newtags']) if x != '']
try:
self._mail_service.update_tags(self._mail_id, new_tags)
mail = self._mail_service.mail(self._mail_id)
diff --git a/service/test/integration/test_tags.py b/service/test/integration/test_tags.py
index b32e89c7..0efcbb6b 100644
--- a/service/test/integration/test_tags.py
+++ b/service/test/integration/test_tags.py
@@ -46,7 +46,7 @@ class TagsTest(SoledadTestBase):
mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
self.client.add_mail_to_inbox(mail)
- self.post_tags(mail.ident, self._tags_json(['tag1', '']))
+ self.post_tags(mail.ident, self._tags_json(['tag1', ' ']))
mail = self.get_mail(mail.ident)
diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/app/js/mail_view/ui/mail_view.js
index eb55dbd5..136b701c 100644
--- a/web-ui/app/js/mail_view/ui/mail_view.js
+++ b/web-ui/app/js/mail_view/ui/mail_view.js
@@ -157,7 +157,7 @@ define(
if (event.which === ENTER_KEY){
event.preventDefault();
- if (this.select('newTagInput').val() !== '') {
+ if (this.select('newTagInput').val().trim() !== '') {
this.createNewTag();
}
} else if (event.which === ESC_KEY) {
diff --git a/web-ui/test/spec/mail_view/ui/mail_view.spec.js b/web-ui/test/spec/mail_view/ui/mail_view.spec.js
index 7d464bcd..55b37de2 100644
--- a/web-ui/test/spec/mail_view/ui/mail_view.spec.js
+++ b/web-ui/test/spec/mail_view/ui/mail_view.spec.js
@@ -188,7 +188,7 @@ describeComponent('mail_view/ui/mail_view', function () {
this.component.select('newTagButton').click();
var newTagInputComponent = this.component.select('newTagInput');
- newTagInputComponent.val('');
+ newTagInputComponent.val(' ');
var e = creatingEvent('keydown', 13); //ENTER KEY EVENT
newTagInputComponent.trigger(e);