Show More
@@ -188,4 +188,3 b' class SettingsController(BaseRepoControl' | |||||
188 | h.flash(_('An error occurred during unlocking'), |
|
188 | h.flash(_('An error occurred during unlocking'), | |
189 | category='error') |
|
189 | category='error') | |
190 | return redirect(url('summary_home', repo_name=repo_name)) |
|
190 | return redirect(url('summary_home', repo_name=repo_name)) | |
191 |
|
@@ -667,4 +667,4 b' class DbManage(object):' | |||||
667 | if not __py_version__ >= (2, 6): |
|
667 | if not __py_version__ >= (2, 6): | |
668 | notify('Python2.5 detected, please switch ' |
|
668 | notify('Python2.5 detected, please switch ' | |
669 | 'egg:waitress#main -> egg:Paste#http ' |
|
669 | 'egg:waitress#main -> egg:Paste#http ' | |
670 | 'in your .ini file') No newline at end of file |
|
670 | 'in your .ini file') |
@@ -118,7 +118,7 b' var show_perms = function(e){' | |||||
118 | YUD.setStyle('my','display','none'); |
|
118 | YUD.setStyle('my','display','none'); | |
119 | YUD.setStyle('pullrequests','display','none'); |
|
119 | YUD.setStyle('pullrequests','display','none'); | |
120 | YUD.setStyle('perms','display',''); |
|
120 | YUD.setStyle('perms','display',''); | |
121 |
YUD.setStyle('q_filter','display','none'); |
|
121 | YUD.setStyle('q_filter','display','none'); | |
122 | } |
|
122 | } | |
123 | YUE.on('show_perms','click',function(e){ |
|
123 | YUE.on('show_perms','click',function(e){ | |
124 | show_perms(); |
|
124 | show_perms(); | |
@@ -134,12 +134,12 b' var show_my = function(e){' | |||||
134 | YUD.setStyle('my','display',''); |
|
134 | YUD.setStyle('my','display',''); | |
135 | YUD.setStyle('q_filter','display',''); |
|
135 | YUD.setStyle('q_filter','display',''); | |
136 |
|
136 | |||
137 |
|
137 | |||
138 | var url = "${h.url('admin_settings_my_repos')}"; |
|
138 | var url = "${h.url('admin_settings_my_repos')}"; | |
139 | ypjax(url, 'my', function(){ |
|
139 | ypjax(url, 'my', function(){ | |
140 | table_sort(); |
|
140 | table_sort(); | |
141 | filter_activate(); |
|
141 | filter_activate(); | |
142 |
}); |
|
142 | }); | |
143 | } |
|
143 | } | |
144 | YUE.on('show_my','click',function(e){ |
|
144 | YUE.on('show_my','click',function(e){ | |
145 | show_my(e); |
|
145 | show_my(e); | |
@@ -154,9 +154,9 b' var show_pullrequests = function(e){' | |||||
154 | YUD.setStyle('perms','display','none'); |
|
154 | YUD.setStyle('perms','display','none'); | |
155 | YUD.setStyle('pullrequests','display',''); |
|
155 | YUD.setStyle('pullrequests','display',''); | |
156 | YUD.setStyle('q_filter','display','none'); |
|
156 | YUD.setStyle('q_filter','display','none'); | |
157 |
|
157 | |||
158 | var url = "${h.url('admin_settings_my_pullrequests')}"; |
|
158 | var url = "${h.url('admin_settings_my_pullrequests')}"; | |
159 |
ypjax(url, 'pullrequests'); |
|
159 | ypjax(url, 'pullrequests'); | |
160 | } |
|
160 | } | |
161 | YUE.on('show_pullrequests','click',function(e){ |
|
161 | YUE.on('show_pullrequests','click',function(e){ | |
162 | show_pullrequests(e) |
|
162 | show_pullrequests(e) | |
@@ -167,12 +167,12 b' var tabs = {' | |||||
167 | 'my': show_my, |
|
167 | 'my': show_my, | |
168 | 'pullrequests': show_pullrequests |
|
168 | 'pullrequests': show_pullrequests | |
169 | } |
|
169 | } | |
170 |
var url = location.href.split('#'); |
|
170 | var url = location.href.split('#'); | |
171 |
if (url[1]) { |
|
171 | if (url[1]) { | |
172 |
//We have a hash |
|
172 | //We have a hash | |
173 | var tabHash = url[1]; |
|
173 | var tabHash = url[1]; | |
174 | console.log(tabs, tabHash) |
|
174 | console.log(tabs, tabHash) | |
175 |
tabs[tabHash](); |
|
175 | tabs[tabHash](); | |
176 | } |
|
176 | } | |
177 |
|
177 | |||
178 | // main table sorting |
|
178 | // main table sorting |
@@ -133,7 +133,7 b'' | |||||
133 | PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA); |
|
133 | PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA); | |
134 |
|
134 | |||
135 | var other_repos_info = ${c.other_repos_info|n}; |
|
135 | var other_repos_info = ${c.other_repos_info|n}; | |
136 |
|
136 | |||
137 | var loadPreview = function(){ |
|
137 | var loadPreview = function(){ | |
138 | YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none'); |
|
138 | YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none'); | |
139 | var url = "${h.url('compare_url', |
|
139 | var url = "${h.url('compare_url', | |
@@ -150,18 +150,18 b'' | |||||
150 | var select_ref_data = select_ref.value.split(':'); |
|
150 | var select_ref_data = select_ref.value.split(':'); | |
151 | var key = null; |
|
151 | var key = null; | |
152 | var val = null; |
|
152 | var val = null; | |
153 |
|
153 | |||
154 | if(select_ref_data.length>1){ |
|
154 | if(select_ref_data.length>1){ | |
155 | key = select_ref.name+"_type"; |
|
155 | key = select_ref.name+"_type"; | |
156 | val = select_ref_data[0]; |
|
156 | val = select_ref_data[0]; | |
157 | url = url.replace(key,val); |
|
157 | url = url.replace(key,val); | |
158 | rev_data[key] = val; |
|
158 | rev_data[key] = val; | |
159 |
|
159 | |||
160 | key = select_ref.name; |
|
160 | key = select_ref.name; | |
161 | val = select_ref_data[1]; |
|
161 | val = select_ref_data[1]; | |
162 | url = url.replace(key,val); |
|
162 | url = url.replace(key,val); | |
163 | rev_data[key] = val; |
|
163 | rev_data[key] = val; | |
164 |
|
164 | |||
165 | }else{ |
|
165 | }else{ | |
166 | key = select_ref.name; |
|
166 | key = select_ref.name; | |
167 | val = select_ref.value; |
|
167 | val = select_ref.value; | |
@@ -175,7 +175,7 b'' | |||||
175 | // replace the <select> of changed repo |
|
175 | // replace the <select> of changed repo | |
176 | YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs']; |
|
176 | YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs']; | |
177 | }); |
|
177 | }); | |
178 |
|
178 | |||
179 | ypjax(url,'pull_request_overview', function(data){ |
|
179 | ypjax(url,'pull_request_overview', function(data){ | |
180 | var sel_box = YUQ('#pull_request_form #other_repo')[0]; |
|
180 | var sel_box = YUQ('#pull_request_form #other_repo')[0]; | |
181 | var repo_name = sel_box.options[sel_box.selectedIndex].value; |
|
181 | var repo_name = sel_box.options[sel_box.selectedIndex].value; |
@@ -47,7 +47,7 b'' | |||||
47 | % if len(c.pull_request_pending_reviewers) > 0: |
|
47 | % if len(c.pull_request_pending_reviewers) > 0: | |
48 | <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div> |
|
48 | <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div> | |
49 | %else: |
|
49 | %else: | |
50 |
<div>${_('pull request was reviewed by all reviewers')}</div> |
|
50 | <div>${_('pull request was reviewed by all reviewers')}</div> | |
51 | %endif |
|
51 | %endif | |
52 | </div> |
|
52 | </div> | |
53 | </div> |
|
53 | </div> |
@@ -25,7 +25,7 b'' | |||||
25 | %endif |
|
25 | %endif | |
26 | </div> |
|
26 | </div> | |
27 | %endif |
|
27 | %endif | |
28 |
</div> |
|
28 | </div> | |
29 | <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">r${cs.revision}:${h.short_id(cs.raw_id)}</a></pre> |
|
29 | <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">r${cs.revision}:${h.short_id(cs.raw_id)}</a></pre> | |
30 | </div> |
|
30 | </div> | |
31 | </td> |
|
31 | </td> |
@@ -400,4 +400,4 b' class TestCompareController(TestControll' | |||||
400 | self.assertFalse("""line1-from-new-parent""" in response.body) |
|
400 | self.assertFalse("""line1-from-new-parent""" in response.body) | |
401 | finally: |
|
401 | finally: | |
402 | RepoModel().delete(r2_id) |
|
402 | RepoModel().delete(r2_id) | |
403 | RepoModel().delete(r1_id) No newline at end of file |
|
403 | RepoModel().delete(r1_id) |
@@ -210,4 +210,3 b' class TestLibs(unittest.TestCase):' | |||||
210 | em = 'test@foo.com' |
|
210 | em = 'test@foo.com' | |
211 | grav = gravatar_url(email_address=em, size=24) |
|
211 | grav = gravatar_url(email_address=em, size=24) | |
212 | assert grav == 'https://server.com/%s/%s' % (_md5(em), 24) |
|
212 | assert grav == 'https://server.com/%s/%s' % (_md5(em), 24) | |
213 |
|
General Comments 0
You need to be logged in to leave comments.
Login now