summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2016-05-10 00:26:03 +0200
committeremkael <emkael@tlen.pl>2016-05-10 00:26:03 +0200
commit33a9cefdcfbf5177b0a72ef42da4a98fca8761fe (patch)
treedd4e67b77940549e4de6b26756e60b5e1895b7fd /app
parent049abe600fc82728fa0a83ae28aeb7fb04063160 (diff)
* sort priority for calendar groups
Diffstat (limited to 'app')
-rw-r--r--app/php/model/Category.php4
-rw-r--r--app/python/rcal/model.py1
2 files changed, 4 insertions, 1 deletions
diff --git a/app/php/model/Category.php b/app/php/model/Category.php
index 5e71e53..87b97b6 100644
--- a/app/php/model/Category.php
+++ b/app/php/model/Category.php
@@ -9,10 +9,12 @@ class Category extends ActiveRecord {
public $ID;
public $Name;
+ public $Priority;
public static $COLUMN_MAPPING = [
'id' => 'ID',
- 'name' => 'Name'
+ 'name' => 'Name',
+ 'priority' => 'Priority'
];
public static $RELATIONS = [
diff --git a/app/python/rcal/model.py b/app/python/rcal/model.py
index 5b16e8b..512c75e 100644
--- a/app/python/rcal/model.py
+++ b/app/python/rcal/model.py
@@ -106,6 +106,7 @@ class Category(BASE):
id = Column(Integer, primary_key=True)
name = Column(String(255), index=True)
+ priority = Column(Integer, index=True)
calendars = relationship(
'Calendar',