Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRogelio Mita <rogeliomita@activitycentral.com>2013-02-28 22:30:13 (GMT)
committer Rogelio Mita <rogeliomita@activitycentral.com>2013-02-28 22:30:13 (GMT)
commit778de18b0bda8e1664d8696988e02ce8269cb266 (patch)
tree9f24ab8a6b523a2ad6908a6e319e93fbf0f0e77d
parent018d49375f440bd9062578e296a1e040ae9b42a3 (diff)
Consistency: MultipleCheckbox -> MultipleCheckBoxv1.0
-rw-r--r--webapp/polls/models.py10
-rw-r--r--webapp/polls/templates/tags/field-options.html4
-rw-r--r--webapp/polls/tests.py12
3 files changed, 13 insertions, 13 deletions
diff --git a/webapp/polls/models.py b/webapp/polls/models.py
index 70356a0..f2b9119 100644
--- a/webapp/polls/models.py
+++ b/webapp/polls/models.py
@@ -6,7 +6,7 @@ from exceptions import *
WIDGET_TYPES = (
('TextInput', 'Respuesta en texto'),
- ('MultipleCheckbox', 'Respuesta con checks (multiple selección)'),
+ ('MultipleCheckBox', 'Respuesta con checks (multiple selección)'),
('RadioButton', 'Respuesta con radios (Solo una selección)'),
('DropDownList', 'Respuesta con lista de opciones'),
)
@@ -43,7 +43,7 @@ class Option(AbastractObject):
class Field(AbastractObject):
rules = {
- 'MultipleCheckbox': (
+ 'MultipleCheckBox': (
lambda f: f.options and len(f.options) > 0,
"Respuesta con checks (multiple selección): necesita "
"al menos una opción."
@@ -71,7 +71,7 @@ class Field(AbastractObject):
if widget_type and widget_type not in dict(WIDGET_TYPES).keys():
raise AttributeError(
- 'valid widget types are TextInput, MultipleCheckbox, \
+ 'valid widget types are TextInput, MultipleCheckBox, \
RadioButton, DropDownList.'
)
@@ -133,7 +133,7 @@ class Field(AbastractObject):
def need_options(self):
return self.widget_type in (
- 'MultipleCheckbox', 'RadioButton', 'DropDownList')
+ 'MultipleCheckBox', 'RadioButton', 'DropDownList')
class Group(AbastractObject):
@@ -159,7 +159,7 @@ class Structure(object):
'groups': {
'0': {
'fields': {
- '0': {'widget_type': 'MultipleCheckbox', 'name': 'sagas'},
+ '0': {'widget_type': 'MultipleCheckBox', 'name': 'sagas'},
'1': {u'widget_type': 'TextInput', u'name': 'otro'}
}
},
diff --git a/webapp/polls/templates/tags/field-options.html b/webapp/polls/templates/tags/field-options.html
index 74393b3..6f352db 100644
--- a/webapp/polls/templates/tags/field-options.html
+++ b/webapp/polls/templates/tags/field-options.html
@@ -89,7 +89,7 @@
var factoryOption = function(id, value) {
// TODO: Desacoplar los widgets de este lugar.
- var with_options = [ "MultipleCheckbox", "DropDownList", "RadioButton" ],
+ var with_options = [ "MultipleCheckBox", "DropDownList", "RadioButton" ],
type = field_widget_type.attr('value');
if ($.inArray(type, with_options) != -1){
@@ -188,7 +188,7 @@
// TODO: Desacoplar los widgets de este lugar.
field_widget_type.on('change', function(event) {
field_options_count = 0;
- var with_options = [ "MultipleCheckbox", "DropDownList", "RadioButton" ];
+ var with_options = [ "MultipleCheckBox", "DropDownList", "RadioButton" ];
var type = $(this).attr('value');
container.contents().remove()
if ($.inArray(type, with_options) == -1) {
diff --git a/webapp/polls/tests.py b/webapp/polls/tests.py
index 5499c00..ed15c18 100644
--- a/webapp/polls/tests.py
+++ b/webapp/polls/tests.py
@@ -46,19 +46,19 @@ class FieldsTests(TestCase):
def test_from_dict(self):
dependence = '343523523'
data = {
- 'widget_type': 'MultipleCheckbox',
+ 'widget_type': 'MultipleCheckBox',
'name': 'field_0',
'dependence': dependence
}
field = Field.from_dict(data)
self.assertEqual('field_0', field.name)
- self.assertEqual('MultipleCheckbox', field.widget_type)
+ self.assertEqual('MultipleCheckBox', field.widget_type)
self.assertEqual(dependence, field.dependence)
def test_add_options(self):
data = {
- 'widget_type': 'MultipleCheckbox',
+ 'widget_type': 'MultipleCheckBox',
'name': 'field_0',
}
field = Field.from_dict(data)
@@ -74,7 +74,7 @@ class FieldsTests(TestCase):
def test_validate(self):
- self.field.widget_type = "MultipleCheckbox"
+ self.field.widget_type = "MultipleCheckBox"
self.assertRaises(Field.ValidationError, self.field.validate)
self.assertEqual(1, len(self.field.errors))
@@ -155,7 +155,7 @@ class StructureTests(TestCase):
'name': 'group_1',
'fields': {
'0': {
- 'widget_type': 'MultipleCheckbox',
+ 'widget_type': 'MultipleCheckBox',
'name': 'field_1_0'
},
'1': {
@@ -185,7 +185,7 @@ class StructureTests(TestCase):
self.assertEqual('RadioButton', field_0_1.widget_type)
field_1_0 = group_1.fields[0]
self.assertEqual('field_1_0', field_1_0.name)
- self.assertEqual('MultipleCheckbox', field_1_0.widget_type)
+ self.assertEqual('MultipleCheckBox', field_1_0.widget_type)
field_1_1 = group_1.fields[1]
self.assertEqual('field_1_1', field_1_1.name)
self.assertEqual('DropDownList', field_1_1.widget_type)