Skip to content

Commit 43ddca2

Browse files
committed
Stuff from today
- Update viur-core 3.7.0.dev3 - PhoneBone - subskel tests - TodoAddForm reset for presentation and profit - ActionSkel tests
1 parent dfe2919 commit 43ddca2

File tree

6 files changed

+78
-68
lines changed

6 files changed

+78
-68
lines changed

Pipfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ verify_ssl = true
44
name = "pypi"
55

66
[packages]
7-
viur-core = "==3.7.0.dev2"
7+
viur-core = "==3.7.0.dev3"
88

99
[dev-packages]
1010
viur-cli = "~=2.0"

Pipfile.lock

+39-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/modules/todo.py

+27-16
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ class Todo(List):
1313
"firstname",
1414
"subject",
1515
),
16-
"actions":["assign"],
17-
"customActions":{
16+
"actions": ["assign"],
17+
"customActions": {
1818
"assign": {
19-
"name": "Zuweisen", # button name
20-
"access": ["todo-edit", "root"], # wer darf triggern
21-
"icon": "person-plus-fill", # button icon
22-
"variant":"success", # button color
23-
"outline":True, # button outline style
24-
"action": "action",
25-
"url": "/todo/assign", # actionSkel initial url
26-
"enabled": 'True', # regel wann button aktiv "TRUE" === immer
27-
"show_label":True, # button ohne label
28-
"target":"popup" # popup, tab
29-
},
19+
"name": "Zuweisen", # button name
20+
"access": ["todo-edit", "root"], # Who may trigger?
21+
"icon": "person-plus-fill", # button icon
22+
"variant": "success", # button color
23+
"outline": True, # button outline style
24+
"action": "action", # ActionSkel
25+
"url": "/{{module}}/assign", # actionSkel initial url
26+
"enabled": 'True', # regel wann button aktiv "TRUE" === immer
27+
"show_label": True, # button ohne label
28+
"target": "popup", # popup, tab
29+
},
3030
}
3131
}
3232

@@ -42,14 +42,19 @@ def canAdd(self):
4242
return True # everyone can add entries!
4343

4444
def addSkel(self):
45-
# TODO: new skel.sub_skel() feature!
45+
# skel = self._resolveSkelCls().subskel(("subject", "message", "*stname"))
46+
# skel = self._resolveSkelCls().subskel("add")
47+
# skel = self._resolveSkelCls().subskel(("message", ), "add")
48+
# return skel
49+
4650
skel = super().addSkel().clone()
47-
#skel.status = None
51+
skel.status = None
52+
skel.user = None
4853
return skel
4954

5055
@exposed
5156
@skey(allow_empty=True)
52-
@access("root", "todo-edit")
57+
@access("todo-edit")
5358
def assign(self, **kwargs):
5459

5560
# ActionSkel for assigning multiple todos to one user
@@ -59,6 +64,11 @@ class TodoAssignSkel(ActionSkel):
5964
descr="Todos",
6065
multiple=True,
6166
required=True,
67+
format="$(dest.lastname) - $(dest.subject)",
68+
refKeys={
69+
"lastname",
70+
"subject",
71+
}
6272
)
6373

6474
user = UserBone(
@@ -73,6 +83,7 @@ class TodoAssignSkel(ActionSkel):
7383
return self.render.edit(action_skel, "assign")
7484

7585
# TODO: Add program logic here
86+
# TODO: Create skel.update() function for transactional in-place update
7687
for todo in action_skel["todo"]:
7788
skel = self.editSkel()
7889
skel.fromDB(todo["dest"]["key"])

deploy/skeletons/todo.py

+10-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33

44

55
class TodoSkel(skeleton.Skeleton):
6+
subSkels = {
7+
"*": ("*name", ),
8+
"add": ["subject"],
9+
}
10+
611
creationdate = DateBone(
712
descr="Erstellt am",
813
readOnly=True,
@@ -11,7 +16,6 @@ class TodoSkel(skeleton.Skeleton):
1116
compute=Compute(fn=utils.utcNow, interval=ComputeInterval(ComputeMethod.Once)),
1217
)
1318

14-
1519
firstname = StringBone(
1620
descr="Vorname",
1721
)
@@ -21,6 +25,11 @@ class TodoSkel(skeleton.Skeleton):
2125
required=True,
2226
)
2327

28+
phone = PhoneBone(
29+
descr="Telefon",
30+
default_country_code="+49",
31+
)
32+
2433
category = SelectBone(
2534
descr="Kategorie",
2635
defaultValue="question",
@@ -43,7 +52,6 @@ class TodoSkel(skeleton.Skeleton):
4352
validHtml=None,
4453
)
4554

46-
4755
status = SelectBone(
4856
descr="Status",
4957
required=True,

deploy/skeletons/user.py

-4
This file was deleted.

sources/site/vue/components/TodoAddForm.vue

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
ref="addform"
1212
module="todo"
1313
action="add"
14-
:useCategories="false"
15-
:layout="TodoAddFormLayout"
1614
>
1715
</vi-form>
1816
</div>
@@ -29,11 +27,8 @@
2927
</template>
3028
<script setup>
3129
/*
32-
33-
3430
:useCategories="false"
35-
36-
31+
:layout="TodoAddFormLayout"
3732
*/
3833
import {ref, reactive, computed} from 'vue'
3934
import loader from '@viur/vue-utils/generic/Loader.vue'

0 commit comments

Comments
 (0)