Revision 61b14287
b/Changelog | ||
---|---|---|
4 | 4 |
Requirements: |
5 | 5 |
-south migration to include database changes |
6 | 6 |
-changes in settings.py.dist: MUNIN_NODES (just remove version attribute) |
7 |
-install python-requests |
|
7 | 8 |
|
8 | 9 |
Features: |
9 | 10 |
-read only users (admin users can assign saved searches to read only users) |
b/README.md | ||
---|---|---|
26 | 26 |
|
27 | 27 |
* python-django (=1.4.5) |
28 | 28 |
* python-mysqldb |
29 |
* python-requests |
|
29 | 30 |
* python-ldap (if ldap user auth is needed) |
30 | 31 |
* django_auth_ldap |
31 | 32 |
* python-bs4 (won't work with <4) |
b/muparse/views.py | ||
---|---|---|
181 | 181 |
cache.set('user_%s_tree_cat'%(request.user.pk), bz2.compress(glist), 60 * 60 * 24 *5) |
182 | 182 |
return HttpResponse(glist, mimetype="application/json") |
183 | 183 |
|
184 |
|
|
184 | 185 |
@login_required |
185 | 186 |
@never_cache |
186 | 187 |
def save_search(request): |
... | ... | |
200 | 201 |
search = form.save(commit=False) |
201 | 202 |
search.save() |
202 | 203 |
form.save_m2m() |
203 |
response = json.dumps({"result": "Successfully saved %s graphs as %s"%(len(graph_pks), search.description), 'errors': 'None'})
|
|
204 |
response = json.dumps({"result": "Successfully saved %s graphs as %s"%(len(graph_pks), search.description), 'errors': None})
|
|
204 | 205 |
return HttpResponse(response, mimetype="application/json") |
205 | 206 |
else: |
206 |
response = json.dumps({"result": "Errors: %s" %(form.errors), 'errors': "True"})
|
|
207 |
response = json.dumps({"result": "Errors: %s" %(form.errors.as_text), 'errors': True})
|
|
207 | 208 |
return HttpResponse(response, mimetype="application/json") |
208 | 209 |
|
209 | 210 |
|
b/mupy/static/js/script.js | ||
---|---|---|
152 | 152 |
$("#id_display_type").val($('#tabs li').index($('#tabs li.active'))); |
153 | 153 |
var formData = $(this).serialize(); |
154 | 154 |
$.post($(this).data('post'), formData, function(out) { |
155 |
swal('Success', out.result, 'success'); |
|
156 |
loadSavedSearches(); |
|
155 |
if (out.errors) { |
|
156 |
swal('Error', out.result, 'warning'); |
|
157 |
} else { |
|
158 |
swal('Success', out.result, 'success'); |
|
159 |
loadSavedSearches(); |
|
160 |
} |
|
157 | 161 |
}); |
158 | 162 |
}) |
159 | 163 |
} |
Also available in: Unified diff