浏览代码

Workspace: Calendar enabling checkbox at creation

Bastien Sevajol (Algoo) 9 年前
父节点
当前提交
a9efafaf84
共有 2 个文件被更改,包括 8 次插入1 次删除
  1. 4 1
      tracim/tracim/controllers/admin/workspace.py
  2. 4 0
      tracim/tracim/templates/admin/workspace_getall.mak

+ 4 - 1
tracim/tracim/controllers/admin/workspace.py 查看文件

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

+ 4 - 0
tracim/tracim/templates/admin/workspace_getall.mak 查看文件

46
                                         <textarea name="description" class="form-control" id="workspaceDescription" placeholder="${_('You may add a description of the workspace')}"></textarea>
46
                                         <textarea name="description" class="form-control" id="workspaceDescription" placeholder="${_('You may add a description of the workspace')}"></textarea>
47
                                     </div>
47
                                     </div>
48
                                     <div class="form-group">
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
                                         <p class="form-control-static">${_('<u>Note</u>: members will be added during next step.')|n}</p>
53
                                         <p class="form-control-static">${_('<u>Note</u>: members will be added during next step.')|n}</p>
50
                                     </div>
54
                                     </div>
51
                                         
55