You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/05/15 23:47:08 UTC
[1/2] git commit: [#6149] add contextual help for new select field
feature
Updated Branches:
refs/heads/master 983418297 -> 8ae6a00e8
[#6149] add contextual help for new select field feature
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8ae6a00e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8ae6a00e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8ae6a00e
Branch: refs/heads/master
Commit: 8ae6a00e8cf851b46694cd4ab28a827d27fc8d65
Parents: 6b96817
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed May 15 21:45:12 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed May 15 21:46:50 2013 +0000
----------------------------------------------------------------------
.../forgetracker/widgets/admin_custom_fields.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8ae6a00e/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/admin_custom_fields.py b/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
index 99681ad..59b07b7 100644
--- a/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
+++ b/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
@@ -83,7 +83,7 @@ class CustomFieldAdminDetail(ffw.StateField):
select=ffw.FieldCluster(
fields=[
ffw.AdminField(field=ew.TextField(name='options',
- label='Options (separate with spaces; prefix with * to set a default)',
+ label='Options (separate with spaces; quote if containing spaces; prefix with * to set a default)',
)) ],
show_labels=False),
milestone=ffw.FieldCluster(
[2/2] git commit: [#6149] ticket:341 use shlex for select custom field
Posted by br...@apache.org.
[#6149] ticket:341 use shlex for select custom field
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6b968178
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6b968178
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6b968178
Branch: refs/heads/master
Commit: 6b9681782047a89518ea36b3b17e6f551d779130
Parents: 9834182
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Sun May 12 18:11:40 2013 +0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed May 15 21:46:50 2013 +0000
----------------------------------------------------------------------
.../forgetracker/tests/functional/test_root.py | 18 +++++++++++++++
ForgeTracker/forgetracker/widgets/ticket_form.py | 3 +-
2 files changed, 20 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6b968178/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index dfaaba1..b80e28b 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -627,6 +627,24 @@ class TestFunctionalController(TrackerTestController):
assert 'normal' in ticket_view
assert 'Test Admin' in ticket_view
+ def test_select_custom_field(self):
+ params = dict(
+ custom_fields=[
+ dict(name='_testselect', label='Test', type='select',
+ options='"test select"'),
+ ],
+ open_status_names='aa bb',
+ closed_status_names='cc',
+ )
+ self.app.post(
+ '/admin/bugs/set_custom_fields',
+ params=variable_encode(params))
+ r = self.app.get('/bugs/new/')
+ assert '<option value="test select">test select</option>' in r
+ kw = {'custom_fields._testselect':'test select'}
+ ticket_view = self.new_ticket(summary='test select custom fields', **kw).follow()
+ assert '<option selected value="test select">test select</option>' in ticket_view
+
def test_custom_field_update_comments(self):
params = dict(
custom_fields=[
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6b968178/ForgeTracker/forgetracker/widgets/ticket_form.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/ticket_form.py b/ForgeTracker/forgetracker/widgets/ticket_form.py
index 0cd13e5..f253484 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_form.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_form.py
@@ -16,6 +16,7 @@
# under the License.
from allura.lib.widgets import form_fields as ffw
+import shlex
from pylons import tmpl_context as c
from formencode import validators as fev
@@ -149,7 +150,7 @@ class TicketCustomField(object):
def _select(field):
options = []
- for opt in field.options.split():
+ for opt in shlex.split(field.options):
selected = False
if opt.startswith('*'):
opt = opt[1:]