##// END OF EJS Templates
routing: fixed depracated patterns for routes matching using /d
super-admin -
r5099:5122f321 default
parent child Browse files
Show More
@@ -611,7 +611,7 b' def admin_routes(config):'
611 611 # user management
612 612 config.add_route(
613 613 name='user_edit',
614 pattern='/users/{user_id:\d+}/edit',
614 pattern=r'/users/{user_id:\d+}/edit',
615 615 user_route=True)
616 616 config.add_view(
617 617 UsersView,
@@ -621,7 +621,7 b' def admin_routes(config):'
621 621
622 622 config.add_route(
623 623 name='user_edit_advanced',
624 pattern='/users/{user_id:\d+}/edit/advanced',
624 pattern=r'/users/{user_id:\d+}/edit/advanced',
625 625 user_route=True)
626 626 config.add_view(
627 627 UsersView,
@@ -631,7 +631,7 b' def admin_routes(config):'
631 631
632 632 config.add_route(
633 633 name='user_edit_global_perms',
634 pattern='/users/{user_id:\d+}/edit/global_permissions',
634 pattern=r'/users/{user_id:\d+}/edit/global_permissions',
635 635 user_route=True)
636 636 config.add_view(
637 637 UsersView,
@@ -641,7 +641,7 b' def admin_routes(config):'
641 641
642 642 config.add_route(
643 643 name='user_edit_global_perms_update',
644 pattern='/users/{user_id:\d+}/edit/global_permissions/update',
644 pattern=r'/users/{user_id:\d+}/edit/global_permissions/update',
645 645 user_route=True)
646 646 config.add_view(
647 647 UsersView,
@@ -651,7 +651,7 b' def admin_routes(config):'
651 651
652 652 config.add_route(
653 653 name='user_update',
654 pattern='/users/{user_id:\d+}/update',
654 pattern=r'/users/{user_id:\d+}/update',
655 655 user_route=True)
656 656 config.add_view(
657 657 UsersView,
@@ -661,7 +661,7 b' def admin_routes(config):'
661 661
662 662 config.add_route(
663 663 name='user_delete',
664 pattern='/users/{user_id:\d+}/delete',
664 pattern=r'/users/{user_id:\d+}/delete',
665 665 user_route=True)
666 666 config.add_view(
667 667 UsersView,
@@ -671,7 +671,7 b' def admin_routes(config):'
671 671
672 672 config.add_route(
673 673 name='user_enable_force_password_reset',
674 pattern='/users/{user_id:\d+}/password_reset_enable',
674 pattern=r'/users/{user_id:\d+}/password_reset_enable',
675 675 user_route=True)
676 676 config.add_view(
677 677 UsersView,
@@ -681,7 +681,7 b' def admin_routes(config):'
681 681
682 682 config.add_route(
683 683 name='user_disable_force_password_reset',
684 pattern='/users/{user_id:\d+}/password_reset_disable',
684 pattern=r'/users/{user_id:\d+}/password_reset_disable',
685 685 user_route=True)
686 686 config.add_view(
687 687 UsersView,
@@ -691,7 +691,7 b' def admin_routes(config):'
691 691
692 692 config.add_route(
693 693 name='user_create_personal_repo_group',
694 pattern='/users/{user_id:\d+}/create_repo_group',
694 pattern=r'/users/{user_id:\d+}/create_repo_group',
695 695 user_route=True)
696 696 config.add_view(
697 697 UsersView,
@@ -702,7 +702,7 b' def admin_routes(config):'
702 702 # user notice
703 703 config.add_route(
704 704 name='user_notice_dismiss',
705 pattern='/users/{user_id:\d+}/notice_dismiss',
705 pattern=r'/users/{user_id:\d+}/notice_dismiss',
706 706 user_route=True)
707 707 config.add_view(
708 708 UsersView,
@@ -713,7 +713,7 b' def admin_routes(config):'
713 713 # user auth tokens
714 714 config.add_route(
715 715 name='edit_user_auth_tokens',
716 pattern='/users/{user_id:\d+}/edit/auth_tokens',
716 pattern=r'/users/{user_id:\d+}/edit/auth_tokens',
717 717 user_route=True)
718 718 config.add_view(
719 719 UsersView,
@@ -723,7 +723,7 b' def admin_routes(config):'
723 723
724 724 config.add_route(
725 725 name='edit_user_auth_tokens_view',
726 pattern='/users/{user_id:\d+}/edit/auth_tokens/view',
726 pattern=r'/users/{user_id:\d+}/edit/auth_tokens/view',
727 727 user_route=True)
728 728 config.add_view(
729 729 UsersView,
@@ -733,7 +733,7 b' def admin_routes(config):'
733 733
734 734 config.add_route(
735 735 name='edit_user_auth_tokens_add',
736 pattern='/users/{user_id:\d+}/edit/auth_tokens/new',
736 pattern=r'/users/{user_id:\d+}/edit/auth_tokens/new',
737 737 user_route=True)
738 738 config.add_view(
739 739 UsersView,
@@ -742,7 +742,7 b' def admin_routes(config):'
742 742
743 743 config.add_route(
744 744 name='edit_user_auth_tokens_delete',
745 pattern='/users/{user_id:\d+}/edit/auth_tokens/delete',
745 pattern=r'/users/{user_id:\d+}/edit/auth_tokens/delete',
746 746 user_route=True)
747 747 config.add_view(
748 748 UsersView,
@@ -752,7 +752,7 b' def admin_routes(config):'
752 752 # user ssh keys
753 753 config.add_route(
754 754 name='edit_user_ssh_keys',
755 pattern='/users/{user_id:\d+}/edit/ssh_keys',
755 pattern=r'/users/{user_id:\d+}/edit/ssh_keys',
756 756 user_route=True)
757 757 config.add_view(
758 758 UsersView,
@@ -762,7 +762,7 b' def admin_routes(config):'
762 762
763 763 config.add_route(
764 764 name='edit_user_ssh_keys_generate_keypair',
765 pattern='/users/{user_id:\d+}/edit/ssh_keys/generate',
765 pattern=r'/users/{user_id:\d+}/edit/ssh_keys/generate',
766 766 user_route=True)
767 767 config.add_view(
768 768 UsersView,
@@ -772,7 +772,7 b' def admin_routes(config):'
772 772
773 773 config.add_route(
774 774 name='edit_user_ssh_keys_add',
775 pattern='/users/{user_id:\d+}/edit/ssh_keys/new',
775 pattern=r'/users/{user_id:\d+}/edit/ssh_keys/new',
776 776 user_route=True)
777 777 config.add_view(
778 778 UsersView,
@@ -781,7 +781,7 b' def admin_routes(config):'
781 781
782 782 config.add_route(
783 783 name='edit_user_ssh_keys_delete',
784 pattern='/users/{user_id:\d+}/edit/ssh_keys/delete',
784 pattern=r'/users/{user_id:\d+}/edit/ssh_keys/delete',
785 785 user_route=True)
786 786 config.add_view(
787 787 UsersView,
@@ -791,7 +791,7 b' def admin_routes(config):'
791 791 # user emails
792 792 config.add_route(
793 793 name='edit_user_emails',
794 pattern='/users/{user_id:\d+}/edit/emails',
794 pattern=r'/users/{user_id:\d+}/edit/emails',
795 795 user_route=True)
796 796 config.add_view(
797 797 UsersView,
@@ -801,7 +801,7 b' def admin_routes(config):'
801 801
802 802 config.add_route(
803 803 name='edit_user_emails_add',
804 pattern='/users/{user_id:\d+}/edit/emails/new',
804 pattern=r'/users/{user_id:\d+}/edit/emails/new',
805 805 user_route=True)
806 806 config.add_view(
807 807 UsersView,
@@ -810,7 +810,7 b' def admin_routes(config):'
810 810
811 811 config.add_route(
812 812 name='edit_user_emails_delete',
813 pattern='/users/{user_id:\d+}/edit/emails/delete',
813 pattern=r'/users/{user_id:\d+}/edit/emails/delete',
814 814 user_route=True)
815 815 config.add_view(
816 816 UsersView,
@@ -820,7 +820,7 b' def admin_routes(config):'
820 820 # user IPs
821 821 config.add_route(
822 822 name='edit_user_ips',
823 pattern='/users/{user_id:\d+}/edit/ips',
823 pattern=r'/users/{user_id:\d+}/edit/ips',
824 824 user_route=True)
825 825 config.add_view(
826 826 UsersView,
@@ -830,7 +830,7 b' def admin_routes(config):'
830 830
831 831 config.add_route(
832 832 name='edit_user_ips_add',
833 pattern='/users/{user_id:\d+}/edit/ips/new',
833 pattern=r'/users/{user_id:\d+}/edit/ips/new',
834 834 user_route_with_default=True) # enabled for default user too
835 835 config.add_view(
836 836 UsersView,
@@ -839,7 +839,7 b' def admin_routes(config):'
839 839
840 840 config.add_route(
841 841 name='edit_user_ips_delete',
842 pattern='/users/{user_id:\d+}/edit/ips/delete',
842 pattern=r'/users/{user_id:\d+}/edit/ips/delete',
843 843 user_route_with_default=True) # enabled for default user too
844 844 config.add_view(
845 845 UsersView,
@@ -849,7 +849,7 b' def admin_routes(config):'
849 849 # user perms
850 850 config.add_route(
851 851 name='edit_user_perms_summary',
852 pattern='/users/{user_id:\d+}/edit/permissions_summary',
852 pattern=r'/users/{user_id:\d+}/edit/permissions_summary',
853 853 user_route=True)
854 854 config.add_view(
855 855 UsersView,
@@ -859,7 +859,7 b' def admin_routes(config):'
859 859
860 860 config.add_route(
861 861 name='edit_user_perms_summary_json',
862 pattern='/users/{user_id:\d+}/edit/permissions_summary/json',
862 pattern=r'/users/{user_id:\d+}/edit/permissions_summary/json',
863 863 user_route=True)
864 864 config.add_view(
865 865 UsersView,
@@ -870,7 +870,7 b' def admin_routes(config):'
870 870 # user user groups management
871 871 config.add_route(
872 872 name='edit_user_groups_management',
873 pattern='/users/{user_id:\d+}/edit/groups_management',
873 pattern=r'/users/{user_id:\d+}/edit/groups_management',
874 874 user_route=True)
875 875 config.add_view(
876 876 UsersView,
@@ -880,7 +880,7 b' def admin_routes(config):'
880 880
881 881 config.add_route(
882 882 name='edit_user_groups_management_updates',
883 pattern='/users/{user_id:\d+}/edit/edit_user_groups_management/updates',
883 pattern=r'/users/{user_id:\d+}/edit/edit_user_groups_management/updates',
884 884 user_route=True)
885 885 config.add_view(
886 886 UsersView,
@@ -890,7 +890,7 b' def admin_routes(config):'
890 890 # user audit logs
891 891 config.add_route(
892 892 name='edit_user_audit_logs',
893 pattern='/users/{user_id:\d+}/edit/audit', user_route=True)
893 pattern=r'/users/{user_id:\d+}/edit/audit', user_route=True)
894 894 config.add_view(
895 895 UsersView,
896 896 attr='user_audit_logs',
@@ -899,7 +899,7 b' def admin_routes(config):'
899 899
900 900 config.add_route(
901 901 name='edit_user_audit_logs_download',
902 pattern='/users/{user_id:\d+}/edit/audit/download', user_route=True)
902 pattern=r'/users/{user_id:\d+}/edit/audit/download', user_route=True)
903 903 config.add_view(
904 904 UsersView,
905 905 attr='user_audit_logs_download',
@@ -909,7 +909,7 b' def admin_routes(config):'
909 909 # user caches
910 910 config.add_route(
911 911 name='edit_user_caches',
912 pattern='/users/{user_id:\d+}/edit/caches',
912 pattern=r'/users/{user_id:\d+}/edit/caches',
913 913 user_route=True)
914 914 config.add_view(
915 915 UsersView,
@@ -919,7 +919,7 b' def admin_routes(config):'
919 919
920 920 config.add_route(
921 921 name='edit_user_caches_update',
922 pattern='/users/{user_id:\d+}/edit/caches/update',
922 pattern=r'/users/{user_id:\d+}/edit/caches/update',
923 923 user_route=True)
924 924 config.add_view(
925 925 UsersView,
@@ -1057,7 +1057,7 b' def includeme(config):'
1057 1057 # pr global redirect
1058 1058 config.add_route(
1059 1059 name='pull_requests_global_0', # backward compat
1060 pattern=ADMIN_PREFIX + '/pull_requests/{pull_request_id:\d+}')
1060 pattern=ADMIN_PREFIX + r'/pull_requests/{pull_request_id:\d+}')
1061 1061 config.add_view(
1062 1062 AdminMainView,
1063 1063 attr='pull_requests',
@@ -1065,7 +1065,7 b' def includeme(config):'
1065 1065
1066 1066 config.add_route(
1067 1067 name='pull_requests_global_1', # backward compat
1068 pattern=ADMIN_PREFIX + '/pull-requests/{pull_request_id:\d+}')
1068 pattern=ADMIN_PREFIX + r'/pull-requests/{pull_request_id:\d+}')
1069 1069 config.add_view(
1070 1070 AdminMainView,
1071 1071 attr='pull_requests',
@@ -1073,7 +1073,7 b' def includeme(config):'
1073 1073
1074 1074 config.add_route(
1075 1075 name='pull_requests_global',
1076 pattern=ADMIN_PREFIX + '/pull-request/{pull_request_id:\d+}')
1076 pattern=ADMIN_PREFIX + r'/pull-request/{pull_request_id:\d+}')
1077 1077 config.add_view(
1078 1078 AdminMainView,
1079 1079 attr='pull_requests',
@@ -637,7 +637,7 b' def includeme(config):'
637 637 # Pull Requests
638 638 config.add_route(
639 639 name='pullrequest_show',
640 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}',
640 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}',
641 641 repo_route=True)
642 642 config.add_view(
643 643 RepoPullRequestsView,
@@ -709,7 +709,7 b' def includeme(config):'
709 709
710 710 config.add_route(
711 711 name='pullrequest_update',
712 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/update',
712 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/update',
713 713 repo_route=True, repo_forbid_when_archived=True)
714 714 config.add_view(
715 715 RepoPullRequestsView,
@@ -719,7 +719,7 b' def includeme(config):'
719 719
720 720 config.add_route(
721 721 name='pullrequest_merge',
722 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/merge',
722 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/merge',
723 723 repo_route=True, repo_forbid_when_archived=True)
724 724 config.add_view(
725 725 RepoPullRequestsView,
@@ -729,7 +729,7 b' def includeme(config):'
729 729
730 730 config.add_route(
731 731 name='pullrequest_delete',
732 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/delete',
732 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/delete',
733 733 repo_route=True, repo_forbid_when_archived=True)
734 734 config.add_view(
735 735 RepoPullRequestsView,
@@ -739,7 +739,7 b' def includeme(config):'
739 739
740 740 config.add_route(
741 741 name='pullrequest_comment_create',
742 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comment',
742 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comment',
743 743 repo_route=True)
744 744 config.add_view(
745 745 RepoPullRequestsView,
@@ -749,7 +749,7 b' def includeme(config):'
749 749
750 750 config.add_route(
751 751 name='pullrequest_comment_edit',
752 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comment/{comment_id}/edit',
752 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comment/{comment_id}/edit',
753 753 repo_route=True, repo_accepted_types=['hg', 'git'])
754 754 config.add_view(
755 755 RepoPullRequestsView,
@@ -759,7 +759,7 b' def includeme(config):'
759 759
760 760 config.add_route(
761 761 name='pullrequest_comment_delete',
762 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comment/{comment_id}/delete',
762 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comment/{comment_id}/delete',
763 763 repo_route=True, repo_accepted_types=['hg', 'git'])
764 764 config.add_view(
765 765 RepoPullRequestsView,
@@ -769,7 +769,7 b' def includeme(config):'
769 769
770 770 config.add_route(
771 771 name='pullrequest_comments',
772 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comments',
772 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comments',
773 773 repo_route=True)
774 774 config.add_view(
775 775 RepoPullRequestsView,
@@ -779,7 +779,7 b' def includeme(config):'
779 779
780 780 config.add_route(
781 781 name='pullrequest_todos',
782 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/todos',
782 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/todos',
783 783 repo_route=True)
784 784 config.add_view(
785 785 RepoPullRequestsView,
@@ -789,7 +789,7 b' def includeme(config):'
789 789
790 790 config.add_route(
791 791 name='pullrequest_drafts',
792 pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/drafts',
792 pattern=r'/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/drafts',
793 793 repo_route=True)
794 794 config.add_view(
795 795 RepoPullRequestsView,
@@ -16,10 +16,7 b''
16 16 # RhodeCode Enterprise Edition, including its added features, Support services,
17 17 # and proprietary license terms, please see https://rhodecode.com/licenses/
18 18
19
20 from rhodecode.apps._base.navigation import NavigationRegistry
21 19 from rhodecode.apps._base import ADMIN_PREFIX
22 from rhodecode.lib.utils2 import str2bool
23 20
24 21
25 22 def admin_routes(config):
@@ -30,7 +27,7 b' def admin_routes(config):'
30 27
31 28 config.add_route(
32 29 name='user_group_members_data',
33 pattern='/user_groups/{user_group_id:\d+}/members',
30 pattern=r'/user_groups/{user_group_id:\d+}/members',
34 31 user_group_route=True)
35 32 config.add_view(
36 33 UserGroupsView,
@@ -41,7 +38,7 b' def admin_routes(config):'
41 38 # user groups perms
42 39 config.add_route(
43 40 name='edit_user_group_perms_summary',
44 pattern='/user_groups/{user_group_id:\d+}/edit/permissions_summary',
41 pattern=r'/user_groups/{user_group_id:\d+}/edit/permissions_summary',
45 42 user_group_route=True)
46 43 config.add_view(
47 44 UserGroupsView,
@@ -51,7 +48,7 b' def admin_routes(config):'
51 48
52 49 config.add_route(
53 50 name='edit_user_group_perms_summary_json',
54 pattern='/user_groups/{user_group_id:\d+}/edit/permissions_summary/json',
51 pattern=r'/user_groups/{user_group_id:\d+}/edit/permissions_summary/json',
55 52 user_group_route=True)
56 53 config.add_view(
57 54 UserGroupsView,
@@ -62,7 +59,7 b' def admin_routes(config):'
62 59 # user groups edit
63 60 config.add_route(
64 61 name='edit_user_group',
65 pattern='/user_groups/{user_group_id:\d+}/edit',
62 pattern=r'/user_groups/{user_group_id:\d+}/edit',
66 63 user_group_route=True)
67 64 config.add_view(
68 65 UserGroupsView,
@@ -73,7 +70,7 b' def admin_routes(config):'
73 70 # user groups update
74 71 config.add_route(
75 72 name='user_groups_update',
76 pattern='/user_groups/{user_group_id:\d+}/update',
73 pattern=r'/user_groups/{user_group_id:\d+}/update',
77 74 user_group_route=True)
78 75 config.add_view(
79 76 UserGroupsView,
@@ -83,7 +80,7 b' def admin_routes(config):'
83 80
84 81 config.add_route(
85 82 name='edit_user_group_global_perms',
86 pattern='/user_groups/{user_group_id:\d+}/edit/global_permissions',
83 pattern=r'/user_groups/{user_group_id:\d+}/edit/global_permissions',
87 84 user_group_route=True)
88 85 config.add_view(
89 86 UserGroupsView,
@@ -93,7 +90,7 b' def admin_routes(config):'
93 90
94 91 config.add_route(
95 92 name='edit_user_group_global_perms_update',
96 pattern='/user_groups/{user_group_id:\d+}/edit/global_permissions/update',
93 pattern=r'/user_groups/{user_group_id:\d+}/edit/global_permissions/update',
97 94 user_group_route=True)
98 95 config.add_view(
99 96 UserGroupsView,
@@ -103,7 +100,7 b' def admin_routes(config):'
103 100
104 101 config.add_route(
105 102 name='edit_user_group_perms',
106 pattern='/user_groups/{user_group_id:\d+}/edit/permissions',
103 pattern=r'/user_groups/{user_group_id:\d+}/edit/permissions',
107 104 user_group_route=True)
108 105 config.add_view(
109 106 UserGroupsView,
@@ -113,7 +110,7 b' def admin_routes(config):'
113 110
114 111 config.add_route(
115 112 name='edit_user_group_perms_update',
116 pattern='/user_groups/{user_group_id:\d+}/edit/permissions/update',
113 pattern=r'/user_groups/{user_group_id:\d+}/edit/permissions/update',
117 114 user_group_route=True)
118 115 config.add_view(
119 116 UserGroupsView,
@@ -123,7 +120,7 b' def admin_routes(config):'
123 120
124 121 config.add_route(
125 122 name='edit_user_group_advanced',
126 pattern='/user_groups/{user_group_id:\d+}/edit/advanced',
123 pattern=r'/user_groups/{user_group_id:\d+}/edit/advanced',
127 124 user_group_route=True)
128 125 config.add_view(
129 126 UserGroupsView,
@@ -133,7 +130,7 b' def admin_routes(config):'
133 130
134 131 config.add_route(
135 132 name='edit_user_group_advanced_sync',
136 pattern='/user_groups/{user_group_id:\d+}/edit/advanced/sync',
133 pattern=r'/user_groups/{user_group_id:\d+}/edit/advanced/sync',
137 134 user_group_route=True)
138 135 config.add_view(
139 136 UserGroupsView,
@@ -144,7 +141,7 b' def admin_routes(config):'
144 141 # user groups delete
145 142 config.add_route(
146 143 name='user_groups_delete',
147 pattern='/user_groups/{user_group_id:\d+}/delete',
144 pattern=r'/user_groups/{user_group_id:\d+}/delete',
148 145 user_group_route=True)
149 146 config.add_view(
150 147 UserGroupsView,
@@ -156,4 +153,3 b' def admin_routes(config):'
156 153 def includeme(config):
157 154 # main admin routes
158 155 config.include(admin_routes, route_prefix=ADMIN_PREFIX)
159
General Comments 0
You need to be logged in to leave comments. Login now