bugfix on user profil definition

.hgignore

@@ -1,10 +0,0 @@
-# use glob syntax.
-syntax: glob
-
-*.elc
-*.pyc
-*~
-
-tg2env/
-pboard/data
-

doc/database/tracim-migrate-to-first-stable-release.sql

@@ -201,7 +201,7 @@ CREATE OR REPLACE RULE pod_insert_new_node AS
   VALUES (nextval('pod_nodes__node_id__sequence'::regclass), new.parent_id, new.node_order, new.node_type, new.created_at, new.updated_at, new.data_label, new.data_content, new.data_datetime, new.node_status, new.data_reminder_datetime, new.data_file_name, new.data_file_content, new.data_file_mime_type, new.parent_tree_path, new.node_depth, new.owner_id, nextval('pod_nodes_version_id_sequence'::regclass), new.is_shared, new.is_public, new.public_url_key, new.workspace_id, new.is_deleted, new.is_archived, new.properties, new.last_action)
   RETURNING pod_nodes_history.node_id, pod_nodes_history.parent_id, pod_nodes_history.node_order, pod_nodes_history.node_type, pod_nodes_history.created_at, pod_nodes_history.updated_at, pod_nodes_history.data_label, pod_nodes_history.data_content, pod_nodes_history.data_datetime, pod_nodes_history.node_status, pod_nodes_history.data_reminder_datetime, pod_nodes_history.data_file_name, pod_nodes_history.data_file_content, pod_nodes_history.data_file_mime_type, pod_nodes_history.parent_tree_path, pod_nodes_history.node_depth, pod_nodes_history.owner_id, pod_nodes_history.is_shared, pod_nodes_history.is_public, pod_nodes_history.public_url_key, pod_nodes_history.workspace_id, pod_nodes_history.is_deleted, pod_nodes_history.is_archived, pod_nodes_history.properties, pod_nodes_history.last_action;
 
+DROP TRIGGER pod_update_node_tg ON pod_nodes;
 CREATE TRIGGER pod_update_node_tg
   INSTEAD OF UPDATE
   ON pod_nodes

tracim/tracim/controllers/admin/user.py

@@ -20,6 +20,7 @@ from formencode.validators import FieldsMatch
 from tracim.controllers import TIMRestController
 from tracim.lib import CST
 from tracim.lib import helpers as h
+from tracim.lib.base import logger
 from tracim.lib.user import UserApi
 from tracim.lib.group import GroupApi
 from tracim.lib.user import UserStaticApi
@@ -36,7 +37,17 @@ class UserProfileAdminRestController(TIMRestController):
     """
     allow_only = predicates.in_any_group(Group.TIM_ADMIN_GROUPNAME)
 
-    allowed_profiles = ['tracim-user', 'tracim-manager', 'tracim-admin']
+    _ALLOWED_PROFILE_USER = 'tracim-profile-user'
+    _ALLOWED_PROFILE_MANAGER = 'tracim-profile-manager'
+    _ALLOWED_PROFILE_ADMIN = 'tracim-profile-admin'
+
+    @property
+    def allowed_profiles(self):
+        return [
+        UserProfileAdminRestController._ALLOWED_PROFILE_USER,
+        UserProfileAdminRestController._ALLOWED_PROFILE_MANAGER,
+        UserProfileAdminRestController._ALLOWED_PROFILE_ADMIN
+    ]
 
     def _before(self, *args, **kw):
         """
@@ -86,7 +97,7 @@ class UserProfileAdminRestController(TIMRestController):
 
         flash_message = _('User updated.') # this is the default value ; should never appear
 
-        if new_profile=='tracim-user':
+        if new_profile==UserProfileAdminRestController._ALLOWED_PROFILE_USER:
             if pod_user_group not in user.groups:
                 user.groups.append(pod_user_group)
 
@@ -102,7 +113,7 @@ class UserProfileAdminRestController(TIMRestController):
 
             flash_message = _('User {} is now a basic user').format(user.get_display_name())
 
-        elif new_profile=='tracim-manager':
+        elif new_profile==UserProfileAdminRestController._ALLOWED_PROFILE_MANAGER:
             if pod_user_group not in user.groups:
                 user.groups.append(pod_user_group)
             if pod_manager_group not in user.groups:
@@ -116,7 +127,7 @@ class UserProfileAdminRestController(TIMRestController):
             flash_message = _('User {} can now workspaces').format(user.get_display_name())
 
 
-        elif new_profile=='tracim-admin':
+        elif new_profile==UserProfileAdminRestController._ALLOWED_PROFILE_ADMIN:
             if pod_user_group not in user.groups:
                 user.groups.append(pod_user_group)
             if pod_manager_group not in user.groups:
@@ -126,8 +137,12 @@ class UserProfileAdminRestController(TIMRestController):
 
             flash_message = _('User {} is now an administrator').format(user.get_display_name())
 
-        DBSession.flush()
+        else:
+            logger.error(self, 'Trying to change user {} profile with unexpected profile {}'.format(user.user_id, new_profile))
+            tg.flash(_('Unknown profile'), CST.STATUS_ERROR)
+            tg.redirect(redirect_url)
 
+        DBSession.flush()
         tg.flash(flash_message, CST.STATUS_OK)
         tg.redirect(redirect_url)
 
@@ -231,15 +246,15 @@ class UserRestController(TIMRestController):
 
     @tg.require(predicates.in_group(Group.TIM_MANAGER_GROUPNAME))
     @tg.expose()
-    def post(self, name, email, password, is_pod_manager='off', is_pod_admin='off'):
-        is_pod_manager = h.on_off_to_boolean(is_pod_manager)
-        is_pod_admin = h.on_off_to_boolean(is_pod_admin)
+    def post(self, name, email, password, is_tracim_manager='off', is_pod_admin='off'):
+        is_tracim_manager = h.on_off_to_boolean(is_tracim_manager)
+        is_tracim_admin = h.on_off_to_boolean(is_pod_admin)
         current_user = tmpl_context.current_user
         current_user = User()
         if current_user.profile.id < Group.TIM_ADMIN:
             # A manager can't give large rights
-            is_pod_manager = False
-            is_pod_admin = False
+            is_tracim_manager = False
+            is_tracim_admin = False
 
 
         api = UserApi(current_user)
@@ -258,9 +273,9 @@ class UserRestController(TIMRestController):
         # Now add the user to related groups
         group_api = GroupApi(current_user)
         user.groups.append(group_api.get_one(Group.TIM_USER))
-        if is_pod_manager:
+        if is_tracim_manager:
             user.groups.append(group_api.get_one(Group.TIM_MANAGER))
-            if is_pod_admin:
+            if is_tracim_admin:
                 user.groups.append(group_api.get_one(Group.TIM_ADMIN))
 
         api.save(user)

tracim/tracim/controllers/user.py

@@ -96,7 +96,7 @@ class UserRestController(TIMRestController):
         pass
 
     @tg.expose()
-    def post(self, name, email, password, is_pod_manager='off', is_pod_admin='off'):
+    def post(self, name, email, password, is_tracim_manager='off', is_pod_admin='off'):
         pass
 
     @tg.expose('tracim.templates.user_get_me')

tracim/tracim/templates/user_edit.mak

@@ -1,4 +1,5 @@
 <%namespace name="TIM" file="tracim.templates.pod"/>
+<%namespace name="FORMS" file="tracim.templates.user_workspace_forms"/>
 
 <%def name="title()"></%def>
 

tracim/tracim/templates/user_get_all.mak

@@ -39,12 +39,12 @@
                                     </div>
                                     <div class="checkbox">
                                       <label>
-                                        <input type="checkbox" class="checkbox" name="is_pod_manager" id="is-pod-manager"> ${_('This user can create workspaces')}
+                                        <input type="checkbox" class="checkbox" name="is_tracim_manager" id="is-tracim-manager"> ${_('This user can create workspaces')}
                                       </label>
                                     </div>
                                     <div class="checkbox disabled">
                                       <label>
-                                        <input type="checkbox" class="checkbox" disabled name="is_pod_admin" id="is-pod-admin"> ${_('This user is an administrator')}
+                                        <input type="checkbox" class="checkbox" disabled name="is_tracim_admin" id="is-tracim-admin"> ${_('This user is an administrator')}
                                       </label>
                                     </div>
                                         
@@ -53,16 +53,16 @@
                                     </span>
                                     <script>
                                         $(document).ready(function() {
-                                            $('#is-pod-manager').change(function() {
-                                                if($('#is-pod-manager').prop('checked')==true) {
+                                            $('#is-tracim-manager').change(function() {
+                                                if($('#is-tracim-manager').prop('checked')==true) {
                                                     console.log('now manager is checked');
-                                                    $('#is-pod-admin').removeAttr('disabled');
-                                                    $('#is-pod-admin').parent().parent().removeClass('disabled');
+                                                    $('#is-tracim-admin').removeAttr('disabled');
+                                                    $('#is-tracim-admin').parent().parent().removeClass('disabled');
                                                 } else {
                                                     console.log('now manager is unchecked');
-                                                    $('#is-pod-admin').prop('checked', false);
-                                                    $('#is-pod-admin').attr('disabled', 'disabled');
-                                                    $('#is-pod-admin').parent().parent().addClass('disabled');
+                                                    $('#is-tracim-admin').prop('checked', false);
+                                                    $('#is-tracim-admin').attr('disabled', 'disabled');
+                                                    $('#is-tracim-admin').parent().parent().addClass('disabled');
                                                 }
                                             });
                                         });
@@ -103,12 +103,12 @@
                                         <td><a href="mailto:${user.email}">${user.email}</a></td>
                                         <td>
                                             <% icon = ('emblems/emblem-unreadable', 'emblems/emblem-checked')[user.profile.id>=2] %>
-                                            <% linked_profile = ('pod-manager', 'pod-user')[user.profile.id>=2] %>
+                                            <% linked_profile = ('tracim-profile-manager', 'tracim-profile-user')[user.profile.id>=2] %>
                                             <a href="${tg.url('/admin/users/{}/profile/switch?new_role={}'.format(user.id, linked_profile))}">${TIM.ICO(16, icon)}</a>
                                         </td>
                                         <td>
                                             <% icon = ('emblems/emblem-unreadable', 'emblems/emblem-checked')[user.profile.id>=3] %>
-                                            <% linked_profile = ('pod-admin', 'pod-manager')[user.profile.id>=3] %>
+                                            <% linked_profile = ('tracim-profile-admin', 'tracim-profile-manager')[user.profile.id>=3] %>
                                             <a href="${tg.url('/admin/users/{}/profile/switch?new_role={}'.format(user.id, linked_profile))}">${TIM.ICO(16, icon)}</a>
                                         </td>
                                     % else:
@@ -121,7 +121,7 @@
                                         </td>
                                         <td>
                                             <% icon = ('emblems/emblem-unreadable-disabled', 'emblems/emblem-checked-disabled')[user.profile.id>=3] %>
-                                            <% linked_profile = ('pod-admin', 'pod-manager')[user.profile.id>=3] %>
+                                            <% linked_profile = ('tracim-profile-admin', 'tracim-profile-manager')[user.profile.id>=3] %>
                                             ${TIM.ICO(16, icon)}
                                         </td>
                                     % endif