Repository: Nitrate/Nitrate

Issue:
Upgrade django-tinymce to 3.0.2



Discussion:

Resolving patch:
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ def get_long_description():
     'beautifulsoup4 >= 4.1.1',
     'django >= 2.1,<3.1',
     'django-contrib-comments == 1.9.2',
-    'django-tinymce == 2.7.0',
+    'django-tinymce == 3.0.2',
     'django-uuslug == 1.2.0',
     'html2text',
     'odfpy >= 0.9.6',
diff --git a/src/tcms/settings/common.py b/src/tcms/settings/common.py
--- a/src/tcms/settings/common.py
+++ b/src/tcms/settings/common.py
@@ -449,75 +449,26 @@
 }
 
 TINYMCE_DEFAULT_CONFIG = {
-    'mode': "exact",
-    'theme': "advanced",
-    'language': "en",
-    'skin': "o2k7",
-    'browsers': "gecko",
+    'branding': False,
     'dialog_type': "modal",
-    'object_resizing': 'true',
-    'cleanup_on_startup': 'true',
-    'forced_root_block': "p",
-    'remove_trailing_nbsp': 'true',
-    'theme_advanced_toolbar_location': "top",
-    'theme_advanced_toolbar_align': "left",
-    'theme_advanced_statusbar_location': "none",
-    'theme_advanced_buttons1': "formatselect,"
-                               "bold,italic,"
-                               "underline,"
-                               "bullist,"
-                               "numlist,"
-                               "link,"
-                               "unlink,"
-                               "image,"
-                               "search,"
-                               "|,"
-                               "outdent,"
-                               "indent,"
-                               "hr,"
-                               "fullscreen,"
-                               "|,"
-                               "help",
-    'theme_advanced_buttons2': "tablecontrols",
-    'theme_advanced_buttons3': "",
-    'theme_advanced_path': 'false',
-    'theme_advanced_blockformats': "p,h2,h3,h4,div,code,pre",
-    'theme_advanced_styles': "[all] clearfix=clearfix;"
-                             "[p] summary=summary;"
-                             "[div] code=code;"
-                             "[img] img_left=img_left;"
-                             "[img] img_left_nospacetop=img_left_nospacetop;"
-                             "[img] img_right=img_right;"
-                             "[img] img_right_nospacetop=img_right_nospacetop;"
-                             "[img] img_block=img_block;"
-                             "[img] img_block_nospacetop=img_block_nospacetop;"
-                             "[div] column span-2=column span-2;"
-                             "[div] column span-4=column span-4;"
-                             "[div] column span-8=column span-8",
-    'height': '300',
+    'language': "en",
+    'menubar': False,
+    'mode': "exact",
+    'theme': "silver",
+
+    'height': 300,
     'width': '100%',
-    'urlconverter_callback': 'myCustomURLConverter',
-    'plugins': "table,safari,"
-               "advimage,"
-               "advlink,"
-               "fullscreen,"
-               "visualchars,"
-               "paste,"
-               "media,"
-               "template,"
-               "searchreplace,"
-               "emotions,",
-    'table_styles': "Header 1=header1;"
-                    "Header 2=header2;"
-                    "Header 3=header3",
-    'table_cell_styles': "Header 1=header1;"
-                         "Header 2=header2;"
-                         "Header 3=header3;"
-                         "Table Cell=tableCel1",
-    'table_row_styles': "Header 1=header1;"
-                        "Header 2=header2;"
-                        "Header 3=header3;"
-                        "Table Row=tableRow1",
+
+    'plugins':
+        'codesample link image hr table fullscreen visualchars paste media '
+        'template searchreplace lists',
+
+    'toolbar':
+        'undo redo | '
+        'formatselect bold italic underline | '
+        'bullist numlist outdent indent | '
+        'codesample table link unlink image search hr | '
+        'fullscreen',
 }
 
 LOCALE_PATHS = (


Test patch: