Remove verbose_name_plural from Page, QuestionSet and Question

rdmorganiser · Oct 10, 2023 · d0f9334 · d0f9334
1 parent b86cc54
commit d0f9334
Show file tree

Hide file tree

Showing 23 changed files with 120 additions and 288 deletions.
diff --git a/rdmo/management/assets/js/components/edit/EditPage.js b/rdmo/management/assets/js/components/edit/EditPage.js
@@ -125,28 +125,16 @@ const EditPage = ({ config, page, elements, elementActions }) => {
           </div>
         </div>
 
-        <Tabs id="#catalog-tabs" defaultActiveKey={0} animation={false}>
+        <Tabs id="#page-tabs" defaultActiveKey={0} animation={false}>
           {
             config.settings && config.settings.languages.map(([lang_code, lang], index) => (
               <Tab key={index} eventKey={index} title={lang}>
-                <div className="row">
-                  <div className="col-sm-12">
-                    <Text config={config} element={page} field={`title_${lang_code }`}
-                          onChange={updatePage} />
-                  </div>
-                  <div className="col-sm-12">
-                    <Textarea config={config} element={page} field={`help_${lang_code }`}
-                              rows={4} onChange={updatePage} />
-                  </div>
-                  <div className="col-sm-6">
-                    <Text config={config} element={page} field={`verbose_name_${lang_code }`}
-                          onChange={updatePage} />
-                  </div>
-                  <div className="col-sm-6">
-                    <Text config={config} element={page} field={`verbose_name_plural_${lang_code }`}
-                          onChange={updatePage} />
-                  </div>
-                </div>
+                <Text config={config} element={page} field={`title_${lang_code }`}
+                      onChange={updatePage} />
+                <Textarea config={config} element={page} field={`help_${lang_code }`}
+                          rows={4} onChange={updatePage} />
+                <Text config={config} element={page} field={`verbose_name_${lang_code }`}
+                      onChange={updatePage} />
               </Tab>
             ))
           }

diff --git a/rdmo/management/assets/js/components/edit/EditQuestion.js b/rdmo/management/assets/js/components/edit/EditQuestion.js
@@ -110,28 +110,16 @@ const EditQuestion = ({ config, question, elements, elementActions}) => {
 
         <Tabs id="#question-tabs" defaultActiveKey={0} animation={false}>
           {
-            config.settings && config.settings.languages.map(([lang_code, lang], index) => {
-              return (
-                <Tab key={index} eventKey={index} title={lang}>
-                  <Text config={config} element={question} field={`text_${lang_code }`}
-                        onChange={updateQuestion} />
-
-                  <Textarea config={config} element={question} field={`help_${lang_code }`}
-                            rows={8} onChange={updateQuestion} />
-
-                  <div className="row">
-                    <div className="col-sm-6">
-                      <Text config={config} element={question} field={`verbose_name_${lang_code }`}
-                            onChange={updateQuestion} />
-                    </div>
-                    <div className="col-sm-6">
-                      <Text config={config} element={question} field={`verbose_name_plural_${lang_code }`}
-                            onChange={updateQuestion} />
-                    </div>
-                  </div>
-                </Tab>
-              )
-            })
+            config.settings && config.settings.languages.map(([lang_code, lang], index) => (
+              <Tab key={index} eventKey={index} title={lang}>
+                <Text config={config} element={question} field={`text_${lang_code }`}
+                      onChange={updateQuestion} />
+                <Textarea config={config} element={question} field={`help_${lang_code }`}
+                          rows={8} onChange={updateQuestion} />
+                <Text config={config} element={question} field={`verbose_name_${lang_code }`}
+                      onChange={updateQuestion} />
+              </Tab>
+            ))
           }
         </Tabs>
 

diff --git a/rdmo/management/assets/js/components/edit/EditQuestionSet.js b/rdmo/management/assets/js/components/edit/EditQuestionSet.js
@@ -134,30 +134,16 @@ const EditQuestionSet = ({ config, questionset, elements, elementActions }) => {
 
         <Tabs id="#catalog-tabs" defaultActiveKey={0} animation={false}>
           {
-            config.settings && config.settings.languages.map(([lang_code, lang], index) => {
-              return (
-                <Tab className="pt-10" key={index} eventKey={index} title={lang}>
-                  <div className="row">
-                    <div className="col-sm-12">
-                      <Text config={config} element={questionset} field={`title_${lang_code }`}
-                            onChange={updateQuestionSet} />
-                    </div>
-                    <div className="col-sm-12">
-                      <Textarea config={config} element={questionset} field={`help_${lang_code }`}
-                                rows={4} onChange={updateQuestionSet} />
-                    </div>
-                    <div className="col-sm-6">
-                      <Text config={config} element={questionset} field={`verbose_name_${lang_code }`}
-                            onChange={updateQuestionSet} />
-                    </div>
-                    <div className="col-sm-6">
-                      <Text config={config} element={questionset} field={`verbose_name_plural_${lang_code }`}
-                            onChange={updateQuestionSet} />
-                    </div>
-                  </div>
-                </Tab>
-              )
-            })
+            config.settings && config.settings.languages.map(([lang_code, lang], index) => (
+              <Tab className="pt-10" key={index} eventKey={index} title={lang}>
+                <Text config={config} element={questionset} field={`title_${lang_code }`}
+                      onChange={updateQuestionSet} />
+                <Textarea config={config} element={questionset} field={`help_${lang_code }`}
+                          rows={4} onChange={updateQuestionSet} />
+                <Text config={config} element={questionset} field={`verbose_name_${lang_code }`}
+                      onChange={updateQuestionSet} />
+              </Tab>
+            ))
           }
         </Tabs>
 

diff --git a/rdmo/projects/serializers/v1/page.py b/rdmo/projects/serializers/v1/page.py
@@ -58,7 +58,6 @@ class QuestionSerializer(ElementModelSerializerMixin, MarkdownSerializerMixin, s
     optionsets = serializers.SerializerMethodField()
 
     verbose_name = serializers.SerializerMethodField()
-    verbose_name_plural = serializers.SerializerMethodField()
     widget_class = serializers.SerializerMethodField()
 
     class Meta:
@@ -72,7 +71,6 @@ class Meta:
             'default_option',
             'default_external_id',
             'verbose_name',
-            'verbose_name_plural',
             'widget_type',
             'widget_class',
             'value_type',
@@ -96,9 +94,6 @@ def get_optionsets(self, obj):
     def get_verbose_name(self, obj):
         return obj.verbose_name or _('entry')
 
-    def get_verbose_name_plural(self, obj):
-        return obj.verbose_name_plural or _('entries')
-
     def get_widget_class(self, obj):
         return get_widget_class(obj.widget_type)
 
@@ -110,7 +105,6 @@ class QuestionSetSerializer(ElementModelSerializerMixin, MarkdownSerializerMixin
     model = serializers.SerializerMethodField()
     elements = serializers.SerializerMethodField()
     verbose_name = serializers.SerializerMethodField()
-    verbose_name_plural = serializers.SerializerMethodField()
 
     class Meta:
         model = QuestionSet
@@ -120,7 +114,6 @@ class Meta:
             'title',
             'help',
             'verbose_name',
-            'verbose_name_plural',
             'attribute',
             'is_collection',
             'elements',
@@ -137,9 +130,6 @@ def get_elements(self, obj):
     def get_verbose_name(self, obj):
         return obj.verbose_name or _('block')
 
-    def get_verbose_name_plural(self, obj):
-        return obj.verbose_name_plural or _('blocks')
-
 
 class PageSerializer(MarkdownSerializerMixin, serializers.ModelSerializer):
 
@@ -150,7 +140,6 @@ class PageSerializer(MarkdownSerializerMixin, serializers.ModelSerializer):
     prev_page = serializers.SerializerMethodField()
     next_page = serializers.SerializerMethodField()
     verbose_name = serializers.SerializerMethodField()
-    verbose_name_plural = serializers.SerializerMethodField()
 
     class Meta:
         model = Page
@@ -159,7 +148,6 @@ class Meta:
             'title',
             'help',
             'verbose_name',
-            'verbose_name_plural',
             'attribute',
             'is_collection',
             'elements',
@@ -193,6 +181,3 @@ def get_next_page(self, obj):
 
     def get_verbose_name(self, obj):
         return obj.verbose_name or _('set')
-
-    def get_verbose_name_plural(self, obj):
-        return obj.verbose_name_plural or _('sets')
diff --git a/rdmo/questions/imports.py b/rdmo/questions/imports.py
@@ -110,7 +110,6 @@ def import_page(element, save=False, user=None):
     set_lang_field(page, 'title', element)
     set_lang_field(page, 'help', element)
     set_lang_field(page, 'verbose_name', element)
-    set_lang_field(page, 'verbose_name_plural', element)
 
     validate_instance(page, element, PageLockedValidator, PageUniqueURIValidator)
 
@@ -148,7 +147,6 @@ def import_questionset(element, save=False, user=None):
     set_lang_field(questionset, 'title', element)
     set_lang_field(questionset, 'help', element)
     set_lang_field(questionset, 'verbose_name', element)
-    set_lang_field(questionset, 'verbose_name_plural', element)
 
     validate_instance(questionset, element, QuestionSetLockedValidator, QuestionSetUniqueURIValidator)
 
@@ -189,7 +187,6 @@ def import_question(element, save=False, user=None):
     set_lang_field(question, 'help', element)
     set_lang_field(question, 'default_text', element)
     set_lang_field(question, 'verbose_name', element)
-    set_lang_field(question, 'verbose_name_plural', element)
 
     set_foreign_field(question, 'default_option', element)
 

diff --git a/rdmo/questions/migrations/0091_remove_page_verbose_name_plural_lang1_and_more.py b/rdmo/questions/migrations/0091_remove_page_verbose_name_plural_lang1_and_more.py
@@ -0,0 +1,73 @@
+# Generated by Django 4.2.5 on 2023-09-30 17:48
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0090_add_editors'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='page',
+            name='verbose_name_plural_lang1',
+        ),
+        migrations.RemoveField(
+            model_name='page',
+            name='verbose_name_plural_lang2',
+        ),
+        migrations.RemoveField(
+            model_name='page',
+            name='verbose_name_plural_lang3',
+        ),
+        migrations.RemoveField(
+            model_name='page',
+            name='verbose_name_plural_lang4',
+        ),
+        migrations.RemoveField(
+            model_name='page',
+            name='verbose_name_plural_lang5',
+        ),
+        migrations.RemoveField(
+            model_name='question',
+            name='verbose_name_plural_lang1',
+        ),
+        migrations.RemoveField(
+            model_name='question',
+            name='verbose_name_plural_lang2',
+        ),
+        migrations.RemoveField(
+            model_name='question',
+            name='verbose_name_plural_lang3',
+        ),
+        migrations.RemoveField(
+            model_name='question',
+            name='verbose_name_plural_lang4',
+        ),
+        migrations.RemoveField(
+            model_name='question',
+            name='verbose_name_plural_lang5',
+        ),
+        migrations.RemoveField(
+            model_name='questionset',
+            name='verbose_name_plural_lang1',
+        ),
+        migrations.RemoveField(
+            model_name='questionset',
+            name='verbose_name_plural_lang2',
+        ),
+        migrations.RemoveField(
+            model_name='questionset',
+            name='verbose_name_plural_lang3',
+        ),
+        migrations.RemoveField(
+            model_name='questionset',
+            name='verbose_name_plural_lang4',
+        ),
+        migrations.RemoveField(
+            model_name='questionset',
+            name='verbose_name_plural_lang5',
+        ),
+    ]
diff --git a/rdmo/questions/models/page.py b/rdmo/questions/models/page.py
@@ -156,31 +156,6 @@ class Page(Model, TranslationMixin):
         verbose_name=_('Name (quinary)'),
         help_text=_('The name displayed for this page in the quinary language.')
     )
-    verbose_name_plural_lang1 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (primary)'),
-        help_text=_('The plural name displayed for this page in the primary language.')
-    )
-    verbose_name_plural_lang2 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (secondary)'),
-        help_text=_('The plural name displayed for this page in the secondary language.')
-    )
-    verbose_name_plural_lang3 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (tertiary)'),
-        help_text=_('The plural name displayed for this page in the tertiary language.')
-    )
-    verbose_name_plural_lang4 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (quaternary)'),
-        help_text=_('The plural name displayed for this page in the quaternary language.')
-    )
-    verbose_name_plural_lang5 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (quinary)'),
-        help_text=_('The plural name displayed for this page in the quinary language.')
-    )
     conditions = models.ManyToManyField(
         Condition, blank=True, related_name='pages',
         verbose_name=_('Conditions'),
@@ -211,10 +186,6 @@ def help(self):
     def verbose_name(self):
         return self.trans('verbose_name')
 
-    @property
-    def verbose_name_plural(self):
-        return self.trans('verbose_name_plural')
-
     @cached_property
     def is_locked(self):
         return self.locked or any(section.is_locked for section in self.sections.all())

diff --git a/rdmo/questions/models/question.py b/rdmo/questions/models/question.py
@@ -178,31 +178,6 @@ class Question(Model, TranslationMixin):
         verbose_name=_('Name (quinary)'),
         help_text=_('The name displayed for this question in the quinary language.')
     )
-    verbose_name_plural_lang1 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (primary)'),
-        help_text=_('The plural name displayed for this question in the primary language.')
-    )
-    verbose_name_plural_lang2 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (secondary)'),
-        help_text=_('The plural name displayed for this question in the secondary language.')
-    )
-    verbose_name_plural_lang3 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (tertiary)'),
-        help_text=_('The plural name displayed for this question in the tertiary language.')
-    )
-    verbose_name_plural_lang4 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (quaternary)'),
-        help_text=_('The plural name displayed for this question in the quaternary language.')
-    )
-    verbose_name_plural_lang5 = models.CharField(
-        max_length=256, blank=True,
-        verbose_name=_('Plural name (quinary)'),
-        help_text=_('The plural name displayed for this question in the quinary language.')
-    )
     widget_type = models.CharField(
         max_length=16,
         verbose_name=_('Widget type'),
@@ -277,10 +252,6 @@ def default_text(self):
     def verbose_name(self):
         return self.trans('verbose_name')
 
-    @property
-    def verbose_name_plural(self):
-        return self.trans('verbose_name_plural')
-
     @cached_property
     def is_locked(self):
         return self.locked or \