Browse Source

minor fixes

Damien Accorsi 10 years ago
parent
commit
c5b4ef4224
2 changed files with 1 additions and 43 deletions
  1. 1 38
      pboard/pboard/controllers/adminuser.py
  2. 0 5
      pboard/pboard/controllers/root.py

+ 1 - 38
pboard/pboard/controllers/adminuser.py View File

@@ -111,8 +111,6 @@ class AdminUserController(CrudRestController):
111 111
     @tg.expose()
112 112
     def put(self, *args, **kw):
113 113
         """update"""
114
-        print ("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU")
115
-        print(kw)
116 114
 
117 115
         user_id = kw['user_id']
118 116
         real_name = kw['display_name']
@@ -121,39 +119,4 @@ class AdminUserController(CrudRestController):
121 119
 
122 120
         updated_user = pld.PODStaticController.updateUser(user_id, real_name, email, groups)
123 121
 
124
-        return
125
-
126
-        omit_fields = []
127
-        if getattr(self, 'edit_form', None):
128
-            omit_fields.extend(self.edit_form.__omit_fields__)
129
-
130
-        for remembered_value in self.remember_values:
131
-            value = kw.get(remembered_value)
132
-            if value is None or value == '':
133
-                omit_fields.append(remembered_value)
134
-
135
-        obj = self.provider.get_obj(self.model, kw)
136
-
137
-        #This should actually by done by provider.update to make it atomic
138
-        can_modify = True
139
-        if obj is not None and self.conditional_update_field is not None and \
140
-           tg.request.if_unmodified_since is not None and \
141
-           tg.request.if_unmodified_since < getattr(obj, self.conditional_update_field):
142
-                can_modify = False
143
-
144
-        if obj is not None and can_modify:
145
-            obj = self.provider.update(self.model, params=kw, omit_fields=omit_fields)
146
-
147
-        if tg.request.response_type == 'application/json':
148
-            if obj is None:
149
-                tg.response.status_code = 404
150
-            elif can_modify is False:
151
-                tg.response.status_code = 412
152
-            elif self.conditional_update_field is not None:
153
-                tg.response.last_modified = getattr(obj, self.conditional_update_field)
154
-
155
-            return dict(model=self.model.__name__,
156
-                        value=self._dictify(obj))
157
-
158
-        pks = self.provider.get_primary_fields(self.model)
159
-        return redirect('../' * len(pks), params=self._kept_params())
122
+        return tg.redirect('../', params=self._kept_params())

+ 0 - 5
pboard/pboard/controllers/root.py View File

@@ -8,11 +8,6 @@ from tg.i18n import ugettext as _, lazy_ugettext as l_
8 8
 from tg import predicates
9 9
 from pboard.lib.auth import can_read
10 10
 
11
-import tgext.admin.tgadminconfig as tgat
12
-import tgext.admin.controller as tgac
13
-
14
-from pboard.controllers import admin as pcad
15
-
16 11
 from pboard.lib.base import BaseController
17 12
 from pboard.controllers.error import ErrorController
18 13