##// END OF EJS Templates
white space cleanup
marcink -
r2478:8eab8111 beta
parent child Browse files
Show More
@@ -382,7 +382,7 b' class ChangesetController(BaseRepoContro'
382 revision=revision,
382 revision=revision,
383 f_path=request.POST.get('f_path'),
383 f_path=request.POST.get('f_path'),
384 line_no=request.POST.get('line'),
384 line_no=request.POST.get('line'),
385 status_change=(ChangesetStatus.get_status_lbl(status)
385 status_change=(ChangesetStatus.get_status_lbl(status)
386 if status and change_status else None)
386 if status and change_status else None)
387 )
387 )
388
388
@@ -62,7 +62,7 b' class PullrequestsController(BaseRepoCon'
62 k, v in repo.branches.iteritems()], _("Branches"))
62 k, v in repo.branches.iteritems()], _("Branches"))
63 bookmarks_group = ([('book:%s:%s' % (k, v), k) for
63 bookmarks_group = ([('book:%s:%s' % (k, v), k) for
64 k, v in repo.bookmarks.iteritems()], _("Bookmarks"))
64 k, v in repo.bookmarks.iteritems()], _("Bookmarks"))
65 tags_group = ([('tag:%s:%s' % (k, v), k) for
65 tags_group = ([('tag:%s:%s' % (k, v), k) for
66 k, v in repo.tags.iteritems()], _("Tags"))
66 k, v in repo.tags.iteritems()], _("Tags"))
67
67
68 hist_l.append(bookmarks_group)
68 hist_l.append(bookmarks_group)
@@ -242,7 +242,7 b' class PullrequestsController(BaseRepoCon'
242 pull_request=pull_request_id,
242 pull_request=pull_request_id,
243 f_path=request.POST.get('f_path'),
243 f_path=request.POST.get('f_path'),
244 line_no=request.POST.get('line'),
244 line_no=request.POST.get('line'),
245 status_change=(ChangesetStatus.get_status_lbl(status)
245 status_change=(ChangesetStatus.get_status_lbl(status)
246 if status and change_status else None)
246 if status and change_status else None)
247 )
247 )
248
248
@@ -216,4 +216,4 b' class BaseRepoController(BaseController)'
216 # some globals counter for menu
216 # some globals counter for menu
217 c.repository_followers = self.scm_model.get_followers(dbr)
217 c.repository_followers = self.scm_model.get_followers(dbr)
218 c.repository_forks = self.scm_model.get_forks(dbr)
218 c.repository_forks = self.scm_model.get_forks(dbr)
219 c.repository_pull_requests = self.scm_model.get_pull_requests(dbr) No newline at end of file
219 c.repository_pull_requests = self.scm_model.get_pull_requests(dbr)
@@ -25,4 +25,4 b''
25
25
26 #TODO: replace that will db.py content after 1.5 Release
26 #TODO: replace that will db.py content after 1.5 Release
27
27
28 from rhodecode.model.db import * No newline at end of file
28 from rhodecode.model.db import *
@@ -566,7 +566,7 b' class InMemoryBundleRepo(bundlerepositor'
566
566
567 def differ(org_repo, org_ref, other_repo, other_ref, discovery_data=None):
567 def differ(org_repo, org_ref, other_repo, other_ref, discovery_data=None):
568 """
568 """
569 General differ between branches, bookmarks or separate but releated
569 General differ between branches, bookmarks or separate but releated
570 repositories
570 repositories
571
571
572 :param org_repo:
572 :param org_repo:
@@ -432,7 +432,7 b' class RemovedFileNode(FileNode):'
432 RemovedFileNodeError.
432 RemovedFileNodeError.
433 """
433 """
434 ALLOWED_ATTRIBUTES = [
434 ALLOWED_ATTRIBUTES = [
435 'name', 'path', 'state', 'is_root', 'is_file', 'is_dir', 'kind',
435 'name', 'path', 'state', 'is_root', 'is_file', 'is_dir', 'kind',
436 'added', 'changed', 'not_changed', 'removed'
436 'added', 'changed', 'not_changed', 'removed'
437 ]
437 ]
438
438
@@ -12,4 +12,4 b' from mercurial.match import match'
12 from mercurial.mdiff import diffopts
12 from mercurial.mdiff import diffopts
13 from mercurial.node import hex
13 from mercurial.node import hex
14 from mercurial.encoding import tolocal
14 from mercurial.encoding import tolocal
15 from mercurial import discovery No newline at end of file
15 from mercurial import discovery
@@ -120,7 +120,7 b' class ChangesetStatusModel(BaseModel):'
120
120
121 if revision:
121 if revision:
122 new_status = _create_status(user=user, repo=repo, status=status,
122 new_status = _create_status(user=user, repo=repo, status=status,
123 comment=comment, revision=revision,
123 comment=comment, revision=revision,
124 pull_request=None)
124 pull_request=None)
125 self.sa.add(new_status)
125 self.sa.add(new_status)
126 return new_status
126 return new_status
@@ -59,7 +59,7 b' class ChangesetCommentsModel(BaseModel):'
59 f_path=None, line_no=None, status_change=None):
59 f_path=None, line_no=None, status_change=None):
60 """
60 """
61 Creates new comment for changeset or pull request.
61 Creates new comment for changeset or pull request.
62 IF status_change is not none this comment is associated with a
62 IF status_change is not none this comment is associated with a
63 status change of changeset or changesets associated with pull request
63 status change of changeset or changesets associated with pull request
64
64
65 :param text:
65 :param text:
@@ -610,4 +610,4 b' class UserModel(BaseModel):'
610 user = self._get_user(user)
610 user = self._get_user(user)
611 obj = UserEmailMap.query().get(email_id)
611 obj = UserEmailMap.query().get(email_id)
612 if obj:
612 if obj:
613 self.sa.delete(obj) No newline at end of file
613 self.sa.delete(obj)
@@ -209,7 +209,7 b''
209 <div class="title">
209 <div class="title">
210 <h5>${_('Email addresses')}</h5>
210 <h5>${_('Email addresses')}</h5>
211 </div>
211 </div>
212
212
213 <div class="emails_wrap">
213 <div class="emails_wrap">
214 <table class="noborder">
214 <table class="noborder">
215 %for em in c.user_email_map:
215 %for em in c.user_email_map:
@@ -221,13 +221,13 b''
221 ${h.hidden('del_email',em.email_id)}
221 ${h.hidden('del_email',em.email_id)}
222 ${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id,
222 ${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id,
223 class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
223 class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
224 ${h.end_form()}
224 ${h.end_form()}
225 </td>
225 </td>
226 </tr>
226 </tr>
227 %endfor
227 %endfor
228 </table>
228 </table>
229 </div>
229 </div>
230
230
231 ${h.form(url('user_emails', id=c.user.user_id),method='put')}
231 ${h.form(url('user_emails', id=c.user.user_id),method='put')}
232 <div class="form">
232 <div class="form">
233 <!-- fields -->
233 <!-- fields -->
@@ -239,7 +239,7 b''
239 <div class="input">
239 <div class="input">
240 ${h.text('new_email', class_='medium')}
240 ${h.text('new_email', class_='medium')}
241 </div>
241 </div>
242 </div>
242 </div>
243 <div class="buttons">
243 <div class="buttons">
244 ${h.submit('save',_('Add'),class_="ui-button")}
244 ${h.submit('save',_('Add'),class_="ui-button")}
245 ${h.reset('reset',_('Reset'),class_="ui-button")}
245 ${h.reset('reset',_('Reset'),class_="ui-button")}
@@ -44,7 +44,7 b" YUE.on('compare_branches','click',functi"
44 .replace('__OTHER__',other.value);
44 .replace('__OTHER__',other.value);
45 window.location=u;
45 window.location=u;
46 }
46 }
47
47
48 })
48 })
49 // main table sorting
49 // main table sorting
50 var myColumnDefs = [
50 var myColumnDefs = [
@@ -18,9 +18,9 b''
18 <div style="float:left" class="changeset-status-container">
18 <div style="float:left" class="changeset-status-container">
19 <div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">&rsaquo;</span></div>
19 <div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">&rsaquo;</span></div>
20 <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change.status_lbl}</div>
20 <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change.status_lbl}</div>
21 <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change.status))}" /></div>
21 <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change.status))}" /></div>
22 </div>
22 </div>
23 %endif
23 %endif
24 %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
24 %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
25 <div class="buttons">
25 <div class="buttons">
26 <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
26 <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
@@ -117,15 +117,15 b''
117 _('Use @username inside this text to send notification to this RhodeCode user')))|n}
117 _('Use @username inside this text to send notification to this RhodeCode user')))|n}
118 | <span class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}
118 | <span class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}
119 <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
119 <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
120 </span>
120 </span>
121 </div>
121 </div>
122 <div id="status_block_container" class="status-block" style="display:none">
122 <div id="status_block_container" class="status-block" style="display:none">
123 %for status,lbl in c.changeset_statuses:
123 %for status,lbl in c.changeset_statuses:
124 <div class="">
124 <div class="">
125 <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" name="changeset_status" value="${status}"> <label>${lbl}</label>
125 <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" name="changeset_status" value="${status}"> <label>${lbl}</label>
126 </div>
126 </div>
127 %endfor
127 %endfor
128 </div>
128 </div>
129 <div class="mentions-container" id="mentions_container"></div>
129 <div class="mentions-container" id="mentions_container"></div>
130 ${h.textarea('text')}
130 ${h.textarea('text')}
131 </div>
131 </div>
@@ -139,17 +139,17 b''
139 <script>
139 <script>
140 YUE.onDOMReady(function () {
140 YUE.onDOMReady(function () {
141 MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
141 MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
142
142
143 // changeset status box listener
143 // changeset status box listener
144 YUE.on(YUD.get('show_changeset_status_box'),'change',function(e){
144 YUE.on(YUD.get('show_changeset_status_box'),'change',function(e){
145 if(e.currentTarget.checked){
145 if(e.currentTarget.checked){
146 YUD.setStyle('status_block_container','display','');
146 YUD.setStyle('status_block_container','display','');
147 }
147 }
148 else{
148 else{
149 YUD.setStyle('status_block_container','display','none');
149 YUD.setStyle('status_block_container','display','none');
150 }
150 }
151 })
151 })
152
152
153 });
153 });
154 </script>
154 </script>
155 </%def>
155 </%def>
@@ -44,7 +44,7 b''
44
44
45 %for op,filenode_path,diff in change:
45 %for op,filenode_path,diff in change:
46 <div id="${h.FID('',filenode_path)}_target" style="clear:both;margin-top:25px"></div>
46 <div id="${h.FID('',filenode_path)}_target" style="clear:both;margin-top:25px"></div>
47 <div id="${h.FID('',filenode_path)}" class="diffblock margined comm">
47 <div id="${h.FID('',filenode_path)}" class="diffblock margined comm">
48 <div class="code-header">
48 <div class="code-header">
49 <div class="changeset_header">
49 <div class="changeset_header">
50 <div class="changeset_file">
50 <div class="changeset_file">
@@ -58,4 +58,4 b''
58 </div>
58 </div>
59 </div>
59 </div>
60 %endfor
60 %endfor
61 </%def> No newline at end of file
61 </%def>
@@ -8,5 +8,5 b''
8 % if status_change is not None:
8 % if status_change is not None:
9 <div>
9 <div>
10 New status -> ${status_change}
10 New status -> ${status_change}
11 </div>
11 </div>
12 % endif No newline at end of file
12 % endif
@@ -19,20 +19,20 b''
19 <div class="title">
19 <div class="title">
20 ${self.breadcrumbs()}
20 ${self.breadcrumbs()}
21 </div>
21 </div>
22
22
23 <h3>${_('Title')}: ${c.pull_request.title}</h3>
23 <h3>${_('Title')}: ${c.pull_request.title}</h3>
24 <div class="changeset-status-container" style="float:left;padding:0px 20px 20px 20px">
24 <div class="changeset-status-container" style="float:left;padding:0px 20px 20px 20px">
25 %if c.current_changeset_status:
25 %if c.current_changeset_status:
26 <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
26 <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
27 <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
27 <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
28 %endif
28 %endif
29 </div>
29 </div>
30 <div style="padding:4px">
30 <div style="padding:4px">
31 <div>${h.fmt_date(c.pull_request.created_on)}</div>
31 <div>${h.fmt_date(c.pull_request.created_on)}</div>
32 </div>
32 </div>
33
33
34 ##DIFF
34 ##DIFF
35
35
36 <div class="table">
36 <div class="table">
37 <div id="body" class="diffblock">
37 <div id="body" class="diffblock">
38 <div style="white-space:pre-wrap;padding:5px">${h.literal(c.pull_request.description)}</div>
38 <div style="white-space:pre-wrap;padding:5px">${h.literal(c.pull_request.description)}</div>
@@ -72,7 +72,7 b''
72 ## render comments main comments form and it status
72 ## render comments main comments form and it status
73 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id),
73 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id),
74 c.current_changeset_status)}
74 c.current_changeset_status)}
75
75
76 </div>
76 </div>
77
77
78 <script type="text/javascript">
78 <script type="text/javascript">
@@ -19,11 +19,11 b''
19 <div class="title">
19 <div class="title">
20 ${self.breadcrumbs()}
20 ${self.breadcrumbs()}
21 </div>
21 </div>
22
22
23 %for pr in c.pull_requests:
23 %for pr in c.pull_requests:
24 <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}">#${pr.pull_request_id}</a>
24 <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}">#${pr.pull_request_id}</a>
25 %endfor
25 %endfor
26
26
27 </div>
27 </div>
28
28
29 <script type="text/javascript"></script>
29 <script type="text/javascript"></script>
@@ -28,7 +28,7 b' from rhodecode import is_windows'
28 from rhodecode.model.meta import Session
28 from rhodecode.model.meta import Session
29 from rhodecode.model.db import User
29 from rhodecode.model.db import User
30 from rhodecode.tests.nose_parametrized import parameterized
30 from rhodecode.tests.nose_parametrized import parameterized
31
31
32 import pylons.test
32 import pylons.test
33
33
34
34
@@ -23,7 +23,7 b' class TestCompareController(TestControll'
23 response.mustcontain('''<a href="/%s/changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO)
23 response.mustcontain('''<a href="/%s/changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO)
24 response.mustcontain('''<a href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)
24 response.mustcontain('''<a href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)
25 response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)
25 response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)
26
26
27 ## files diff
27 ## files diff
28 response.mustcontain('''<div class="node"><a href="/%s/compare/tag@%s...tag@%s#C--1c5cf9e91c12">docs/api/utils/index.rst</a></div>''' % (HG_REPO, tag1, tag2))
28 response.mustcontain('''<div class="node"><a href="/%s/compare/tag@%s...tag@%s#C--1c5cf9e91c12">docs/api/utils/index.rst</a></div>''' % (HG_REPO, tag1, tag2))
29 response.mustcontain('''<div class="node"><a href="/%s/compare/tag@%s...tag@%s#C--e3305437df55">test_and_report.sh</a></div>''' % (HG_REPO, tag1, tag2))
29 response.mustcontain('''<div class="node"><a href="/%s/compare/tag@%s...tag@%s#C--e3305437df55">test_and_report.sh</a></div>''' % (HG_REPO, tag1, tag2))
General Comments 0
You need to be logged in to leave comments. Login now