equal
deleted
inserted
replaced
246 wrapped_text_version, _ , _ = spannify(text_version.get_content()) |
246 wrapped_text_version, _ , _ = spannify(text_version.get_content()) |
247 |
247 |
248 from cm.models import ApplicationConfiguration |
248 from cm.models import ApplicationConfiguration |
249 categories = {} |
249 categories = {} |
250 for i in range(1, 6): |
250 for i in range(1, 6): |
251 if text_version.__dict__['category_' + str(i)] != None and text_version.__dict__['category_' + str(i)].lower() != 'none': |
251 if text_version.__dict__['category_' + str(i)] == None or text_version.__dict__['category_' + str(i)].lower() != 'none': |
252 if text_version.__dict__['category_' + str(i)] != None and text_version.__dict__['category_' + str(i)] != '': |
252 if text_version.__dict__['category_' + str(i)] != None and text_version.__dict__['category_' + str(i)] != '': |
253 categories[i] = text_version.__dict__['category_' + str(i)] |
253 categories[i] = text_version.__dict__['category_' + str(i)] |
254 else: |
254 else: |
255 if ApplicationConfiguration.get_key('workspace_category_' + str(i)) != None and ApplicationConfiguration.get_key('workspace_category_' + str(i)) != '': |
255 if ApplicationConfiguration.get_key('workspace_category_' + str(i)) != None and ApplicationConfiguration.get_key('workspace_category_' + str(i)) != '': |
256 categories[i] = ApplicationConfiguration.get_key('workspace_category_' + str(i)) |
256 categories[i] = ApplicationConfiguration.get_key('workspace_category_' + str(i)) |