Skip to content

Commit

Permalink
Fix bugs with show_edit_form function
Browse files Browse the repository at this point in the history
  • Loading branch information
UmSenhorQualquer committed Feb 20, 2019
1 parent 56f1b98 commit bd05fa4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 31 deletions.
41 changes: 11 additions & 30 deletions pyforms_web/widgets/django/modeladmin.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,10 @@
import dill
from pyforms_web.basewidget import BaseWidget, segment
from pyforms_web.controls.control_textarea import ControlTextArea
from pyforms_web.controls.control_text import ControlText
from pyforms_web.controls.control_integer import ControlInteger
from pyforms_web.controls.control_float import ControlFloat
from pyforms_web.controls.control_combo import ControlCombo
from pyforms_web.controls.control_date import ControlDate
from pyforms_web.controls.control_datetime import ControlDateTime
from pyforms_web.controls.control_button import ControlButton
from pyforms_web.controls.control_querylist import ControlQueryList
from pyforms_web.controls.control_multipleselection import ControlMultipleSelection
from pyforms_web.controls.control_emptywidget import ControlEmptyWidget
from pyforms_web.controls.control_fileupload import ControlFileUpload
from pyforms_web.controls.control_checkbox import ControlCheckBox


from pyforms_web.web.middleware import PyFormsMiddleware
from django.core.exceptions import ValidationError, FieldDoesNotExist
from .utils import get_fieldsets_strings
import traceback
from django.conf import settings
from django.db import models
import os


from .modelform import ModelFormWidget
from pyforms_web.basewidget import BaseWidget, segment
from pyforms_web.controls.control_button import ControlButton
from pyforms_web.controls.control_querylist import ControlQueryList
from pyforms_web.controls.control_emptywidget import ControlEmptyWidget
from pyforms_web.web.middleware import PyFormsMiddleware
from .modelform import ModelFormWidget
from django.db import models

class ModelAdminWidget(BaseWidget):
"""
Expand Down Expand Up @@ -274,12 +254,13 @@ def show_create_form(self):
self._details.hide()


def show_edit_form(self, obj=None):
def show_edit_form(self, obj_pk=None):
"""
Show the edition for for a specific object
:param django.db.models.Model obj: Object to be edited
:param int obj_pk: Primary key of the object to be show in the edit form.
"""
obj = self.model.objects.get(pk=obj_pk)
# if there is no edit permission then does not show the form
if not self.has_view_permissions(obj): return

Expand Down Expand Up @@ -437,7 +418,7 @@ def __list_item_selection_changed_event(self):
if self.has_view_permissions(obj):
self.object_pk = obj.pk
self._list.selected_row_id = None
self.show_edit_form(obj)
self.show_edit_form(obj.pk)
else:
raise Exception('You do not have permissions to visualize this record.')

Expand Down
2 changes: 1 addition & 1 deletion pyforms_web/widgets/django/modelform.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def show_edit_form(self, pk=None):
"""
This function prepares the fields to be shown as edit form.
:param int pk: Primiry key of the object to be show in the edit form.
:param int pk: Primary key of the object to be show in the edit form.
Returns:
:django.db.models.Model object: Returns the object in edition.
Expand Down

0 comments on commit bd05fa4

Please sign in to comment.