equal
deleted
inserted
replaced
119 |
119 |
120 # If we find one, we can use it to 'extend' from |
120 # If we find one, we can use it to 'extend' from |
121 if meta: |
121 if meta: |
122 dynamodel = getattr(meta, 'model', None) |
122 dynamodel = getattr(meta, 'model', None) |
123 |
123 |
|
124 originclude = getattr(meta, 'include', []) |
|
125 origexclude = getattr(meta, 'exclude', []) |
|
126 |
124 if not dynainclude: |
127 if not dynainclude: |
125 dynainclude = [] |
128 dynainclude = originclude |
|
129 originclude = [] |
126 if not dynaexclude: |
130 if not dynaexclude: |
127 dynaexclude = [] |
131 dynaexclude = origexclude |
|
132 origexclude = [] |
128 |
133 |
129 if append: |
134 if append: |
130 dynainclude += getattr(meta, 'include', []) |
135 dynainclude += originclude |
131 dynaexclude += getattr(meta, 'exclude', []) |
136 dynaexclude += origexclude |
132 |
137 |
133 # The most intersting parameter, the 'extra fields' dictionary |
138 # The most intersting parameter, the 'extra fields' dictionary |
134 dynaconf = getattr(meta, 'dynaconf', {}) |
139 dynaconf = getattr(meta, 'dynaconf', {}) |
135 if not dynafields: |
140 if not dynafields: |
136 dynafields = dynaconf |
141 dynafields = dynaconf |