Changeset 12247 for main

Timestamp:

15 Dec 2014, 13:29:51 (10 years ago)

Author:

Henrik Bettermann

Message:

Remove deprecated HTML and REST widgets and use html2dict instead.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/applicants/browser.py (modified) (7 diffs)
• src/waeup/kofa/applicants/browser_templates/applicantscontainerpage.pt (modified) (2 diffs)
• src/waeup/kofa/students/browser.py (modified) (1 diff)
• src/waeup/kofa/widgets/htmlwidget.py (deleted)
• src/waeup/kofa/widgets/restwidget.py (deleted)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.3dev (unreleased)
 ===================
+
+* Remove deprecated HTML and REST widgets and use html2dict instead.
 
 * Do not import codes with spaces.

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -34 +34 @@
     IApplicantRegisterUpdate, ISpecialApplicant
     )
+from waeup.kofa.utils.helpers import html2dict
 from waeup.kofa.applicants.container import (
     ApplicantsContainer, VirtualApplicantsExportJobContainer)
@@ -60 +61 @@
     FriendlyDateDisplayWidget,
     FriendlyDatetimeDisplayWidget)
-from waeup.kofa.widgets.htmlwidget import HTMLDisplayWidget
 
 grok.context(IKofaObject) # Make IKofaObject the default context
@@ -72 +72 @@
     grok.require('waeup.Public')
     form_fields = grok.AutoFields(IApplicantsRoot)
-    form_fields['description'].custom_widget = HTMLDisplayWidget
     label = _('Application Section')
     pnav = 3
@@ -189 +188 @@
         return del_local_roles(self,3,**data)
 
-    def _description(self):
-        view = ApplicantsRootPage(
-            self.context,self.request)
-        view.setUpWidgets()
-        return view.widgets['description']()
-
     @action(_('Save'), style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
-        self.context.description_dict = self._description()
+        description = getattr(self.context, 'description', None)
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        self.context.description_dict = html2dict(description, portal_language)
         self.flash(_('Form has been saved.'))
         return
@@ -302 +297 @@
     @property
     def form_fields(self):
-        form_fields = grok.AutoFields(IApplicantsContainer).omit('title')
-        form_fields['description'].custom_widget = HTMLDisplayWidget
+        form_fields = grok.AutoFields(IApplicantsContainer).omit(
+            'title', 'description')
         form_fields[
             'startdate'].custom_widget = FriendlyDatetimeDisplayWidget('le')
@@ -368 +363 @@
         return get_users_with_local_roles(self.context)
 
-    def _description(self):
-        view = ApplicantsContainerPage(
-            self.context,self.request)
-        view.setUpWidgets()
-        return view.widgets['description']()
-
     @action(_('Save'), style='primary')
     def save(self, **data):
@@ -381 +370 @@
         else:
             changed_fields = []
-        self.context.description_dict = self._description()
+        description = getattr(self.context, 'description', None)
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        self.context.description_dict = html2dict(description, portal_language)
         # Always refresh title. So we can change titles
         # if APP_TYPES_DICT has been edited.

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantscontainerpage.pt

@@ -2 +2 @@
   <tbody>
     <tal:block repeat="widget view/widgets">
-      <tal:condition condition="python:widget.name != 'form.description'">
       <tr>
         <td class="fieldname">
@@ -11 +10 @@
         </td>
       </tr>
-      </tal:condition>
     </tal:block>
   </tbody>

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -64 +64 @@
 from waeup.kofa.utils.batching import VirtualExportJobContainer
 from waeup.kofa.utils.helpers import get_current_principal, to_timezone, now
-from waeup.kofa.widgets.restwidget import ReSTDisplayWidget
 from waeup.kofa.students.interfaces import (
     IStudentsContainer, IStudent,