Download as
Browse Code »

Commit 8c9357796879845b0d6c23e14fb13f547fdfa5d7

Authored by Luan
2 parents 9fdd56e8 006fe4a1
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Merge branch 'haystack'

Showing 1 changed file with 9 additions and 19 deletions   Show diff stats
src/super_archives/utils/url.py
  Diff comments   View file @8c93577
... ... @@ -12,23 +12,13 @@ def append_to_get(path, query=None, **kwargs):
12 12  
13 13  
14 14 def pop_from_get(path, query=None, **kwargs):
15   - # Getting the path with the query
16   - print query
17   -
18   - current_url = u'{}?{}'.format(
19   - path,
20   - query,
21   - )
  15 + query_dict = dict(urlparse.parse_qsl(query))
22 16 for key, value in kwargs.items():
23   - popitem = u'{}={}'.format(key, value)
24   - if query == popitem:
25   - return path
26   -
27   - if key not in current_url:
28   - return current_url
29   -
30   - first_path, end_path = current_url.split(key)
31   - end_path_without_element = end_path.split(value, 1)
32   - path_list = first_path + end_path_without_element
33   - print path_list
34   - return u''.join(path_list)
  17 + if not query_dict.has_key(key):
  18 + continue
  19 + if query_dict[key] == value:
  20 + del query_dict[key]
  21 + continue
  22 + if not query_dict:
  23 + return u'{}?q='.format(path)
  24 + return u'{}?{}'.format(path, urllib.urlencode(query_dict))
... ...