Changeset 107f4e in indico

Timestamp:

09/07/10 15:23:12 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

e52fa3

Parents:

cfb660

git-author:

Leszek Syroka <leszek.marek.syroka@…> (08/26/10 14:44:58)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (09/07/10 15:23:12)

Message:

[FIX] Roombooking access restrictions

• room booking module can be accessed only by user/groups specified in roombooking plugin setup
• new type 'usersGroups' added to the plugin system
• min width added to PluginOptionPeopleListDiv?
• in UserWidget? 'Group: ' is added before group name
• fix#474

Location:

indico

Files:

• MaKaC/plugins/RoomBooking/__init__.py (modified) (1 diff)
• MaKaC/plugins/RoomBooking/options.py (added)
• MaKaC/plugins/base.py (modified) (1 diff)
• MaKaC/services/implementation/plugins.py (modified) (2 diffs)
• MaKaC/webinterface/pages/errors.py (modified) (1 diff)
• MaKaC/webinterface/rh/base.py (modified) (2 diffs)
• MaKaC/webinterface/rh/roomBooking.py (modified) (3 diffs)
• MaKaC/webinterface/tpls/AdminPluginsOptionList.tpl (modified) (1 diff)
• htdocs/css/Default.css (modified) (1 diff)
• htdocs/js/indico/Management/Users.js (modified) (1 diff)

indico/MaKaC/plugins/RoomBooking/__init__.py

@@ -22 +22 @@
 pluginTypeDescription = _("Room Booking Plugins")
 ignore = False
-visible = False
+visible = True

indico/MaKaC/plugins/base.py

@@ -692 +692 @@
     _extraTypes = {
         'users': list,
+        'usersGroups': list,
         'rooms': list
     }

indico/MaKaC/services/implementation/plugins.py

@@ -59 +59 @@
         
     def _getAnswer(self):
-        if self._targetOption.getType() == 'users':
+        if self._targetOption.getType() == 'users' or self._targetOption.getType() == 'usersGroups':
             optionValue = self._targetOption.getValue()
             existingUserIds = set([u.getId() for u in optionValue])
@@ -78 +78 @@
         
     def _getAnswer(self):
-        if self._targetOption.getType() == 'users':
+        if self._targetOption.getType() == 'users' or self._targetOption.getType() == 'usersGroups':
             self._targetOption.getValue().remove(self._targetUser)
             self._targetOption._notifyModification()

indico/MaKaC/webinterface/pages/errors.py

@@ -206 +206 @@
 
     def _getBody( self, params ):
-        if self._rh._target.getAccessKey() != "" or ( (not type(self._rh._target) is Category) and self._rh._target.getConference().getAccessKey() != ""):
+        if self._rh._target and (self._rh._target.getAccessKey() != "" or ( (not type(self._rh._target) is Category) and self._rh._target.getConference().getAccessKey() != "")):
             msg = ""
             sess = self._rh._getSession()

indico/MaKaC/webinterface/rh/base.py

@@ -61 +61 @@
 
 from MaKaC.common.TemplateExec import escapeHTMLForJS
+
+from MaKaC.plugins.base import PluginsHolder
+from MaKaC.user import Group, Avatar
+from MaKaC.accessControl import AdminList
+
 
 class RequestHandlerBase(object):
@@ -762 +767 @@
 
 
+class RHRoomBookingProtected( RHProtected ):
+
+    def _checkSessionUser( self ):
+        user = self._getUser()
+        if user == None:
+            self._redirect( self._getLoginURL() )
+            self._doProcess = False
+        else:
+            try:
+                if PluginsHolder().getPluginType("RoomBooking").isActive():
+                    if not AdminList.getInstance().isAdmin(user):
+                        authenticatedUser = False
+                        for entity in PluginsHolder().getPluginType("RoomBooking").getOption("AuthorisedUsersGroups").getValue():
+                            if isinstance(entity, Group) and entity.containsUser(user) or \
+                               isinstance(entity, Avatar) and entity == user:
+                                    authenticatedUser = True
+                                    break
+                        if not authenticatedUser:
+                            raise AccessError()
+            except KeyError:
+                pass
+
 class RHDisplayBaseProtected( RHProtected ):
 

indico/MaKaC/webinterface/rh/roomBooking.py

@@ -27 +27 @@
 from MaKaC.common.general import *
 from MaKaC.common.Configuration import Config
-from MaKaC.webinterface.rh.base import RHProtected, RoomBookingDBMixin
+from MaKaC.webinterface.rh.base import RoomBookingDBMixin, RHRoomBookingProtected
 from datetime import datetime, timedelta
 from MaKaC.common.utils import HolidaysHolder, validMail, setValidEmailSeparators
@@ -52 +52 @@
 
 
-class RHRoomBookingBase( RoomBookingDBMixin, RHProtected ):
+class RHRoomBookingBase( RoomBookingDBMixin, RHRoomBookingProtected ):
     """
     All room booking related hanlders are derived from this class.
@@ -62 +62 @@
 
     def _checkProtection( self ):
-        RHProtected._checkProtection(self)
+        RHRoomBookingProtected._checkProtection(self)
 
     def _clearSessionState( self ):

indico/MaKaC/webinterface/tpls/AdminPluginsOptionList.tpl

@@ -129 +129 @@
                     </script>
                <% end %>
+               <% elif option.getType() == "usersGroups": %>
+                    <div id="userGroupList<%=name%>" style="margin-bottom: 10px">
+                    </div>
+
+                    <script type="text/javascript">
+                        var newPersonsHandler = function(userList, setResult) {
+                            indicoRequest(
+                                'plugins.addUsers',
+                                {
+                                    optionName: "<%= name %>",
+                                    userList: userList
+                                },
+                                function(result,error) {
+                                    if (!error) {
+                                        setResult(true);
+                                    } else {
+                                        IndicoUtil.errorReport(error);
+                                        setResult(false);
+                                    }
+                                }
+                            );
+                        }
+                        var removePersonHandler = function(user, setResult) {
+                            indicoRequest(
+                                'plugins.removeUser',
+                                {
+                                    optionName: "<%= name %>",
+                                    user: user.get('id')
+                                },
+                                function(result,error) {
+                                    if (!error) {
+                                        setResult(true);
+                                    } else {
+                                        IndicoUtil.errorReport(error);
+                                        setResult(false);
+                                    }
+                                }
+                            );
+                        }
+
+                        var uf = new UserListField('PluginOptionPeopleListDiv', 'PeopleList',
+                                                   <%= jsonEncode(fossilize(option.getValue())) %>, true, null,
+                                                   true, true, null, null,
+                                                   false, false, true,
+                                                   newPersonsHandler, userListNothing, removePersonHandler)
+                        $E('userGroupList<%=name%>').set(uf.draw())
+                    </script>
+                <% end %>
                 <% else: %>
                     <% if option.getType() == list: %>

indico/htdocs/css/Default.css

@@ -1897 +1897 @@
     border: 1px dashed #CCCCCC;
     min-height: 25px;
+    min-width: 320px;
 }
 

indico/htdocs/js/indico/Management/Users.js

@@ -1373 +1373 @@
                  var removeButtonDiv = Html.div({style: {cssFloat: "right", paddingRight: pixels(10), paddingTop: pixels(5)}}, removeButton);
                  var groupName = $B(Html.span(), userData.accessor('name'));
-                 return Html.span({}, removeButtonDiv, groupName);
+                 return Html.span({}, removeButtonDiv, Html.span({style:{fontWeight:'bold'}}, 'Group: '), groupName);
 
              } else {