Browse Source

Workspace: Calendar enabling checkbox at creation

Bastien Sevajol (Algoo) 8 years ago
parent
commit
a9efafaf84

+ 4 - 1
tracim/tracim/controllers/admin/workspace.py View File

@@ -14,6 +14,7 @@ from tracim.lib.user import UserApi
14 14
 from tracim.lib.userworkspace import RoleApi
15 15
 from tracim.lib.content import ContentApi
16 16
 from tracim.lib.workspace import WorkspaceApi
17
+from tracim.model import DBSession
17 18
 
18 19
 from tracim.model.auth import Group
19 20
 from tracim.model.data import NodeTreeItem
@@ -190,12 +191,14 @@ class WorkspaceRestController(TIMRestController, BaseController):
190 191
         return dict(result = dictified_workspace, fake_api = fake_api)
191 192
 
192 193
     @tg.expose()
193
-    def post(self, name, description):
194
+    def post(self, name, description, calendar_enabled=False):
194 195
         # FIXME - Check user profile
195 196
         user = tmpl_context.current_user
196 197
         workspace_api_controller = WorkspaceApi(user)
197 198
 
198 199
         workspace = workspace_api_controller.create_workspace(name, description)
200
+        workspace.calendar_enabled = calendar_enabled
201
+        DBSession.flush()
199 202
 
200 203
         tg.flash(_('{} workspace created.').format(workspace.label), CST.STATUS_OK)
201 204
         tg.redirect(self.url())

+ 4 - 0
tracim/tracim/templates/admin/workspace_getall.mak View File

@@ -46,6 +46,10 @@
46 46
                                         <textarea name="description" class="form-control" id="workspaceDescription" placeholder="${_('You may add a description of the workspace')}"></textarea>
47 47
                                     </div>
48 48
                                     <div class="form-group">
49
+                                        <label for="workspaceCalendarEnabled">${_('Calendar enabled')}</label>
50
+                                        <input id="workspaceCalendarEnabled" name="calendar_enabled" class="form-control" type="checkbox" checked />
51
+                                    </div>
52
+                                    <div class="form-group">
49 53
                                         <p class="form-control-static">${_('<u>Note</u>: members will be added during next step.')|n}</p>
50 54
                                     </div>
51 55