Show More
@@ -107,5 +107,5 b' def validate_default_reviewers(review_me' | |||
|
107 | 107 | return reviewers |
|
108 | 108 | |
|
109 | 109 | |
|
110 | def validate_observers(observer_members): | |
|
110 | def validate_observers(observer_members, reviewer_rules): | |
|
111 | 111 | return {} |
@@ -412,6 +412,7 b' def sanitize_settings_and_apply_defaults' | |||
|
412 | 412 | """ |
|
413 | 413 | |
|
414 | 414 | settings.setdefault('rhodecode.edition', 'Community Edition') |
|
415 | settings.setdefault('rhodecode.edition_id', 'CE') | |
|
415 | 416 | |
|
416 | 417 | if 'mako.default_filters' not in settings: |
|
417 | 418 | # set custom default filters if we don't have it defined |
@@ -293,6 +293,7 b' def attach_context_attributes(context, r' | |||
|
293 | 293 | context.rc_config = rc_config |
|
294 | 294 | context.rhodecode_version = rhodecode.__version__ |
|
295 | 295 | context.rhodecode_edition = config.get('rhodecode.edition') |
|
296 | context.rhodecode_edition_id = config.get('rhodecode.edition_id') | |
|
296 | 297 | # unique secret + version does not leak the version but keep consistency |
|
297 | 298 | context.rhodecode_version_hash = calculate_version_hash(config) |
|
298 | 299 |
@@ -495,7 +495,8 b' ul.auth_plugins {' | |||
|
495 | 495 | padding-top: 10px; |
|
496 | 496 | } |
|
497 | 497 | |
|
498 |
#add_reviewer_input |
|
|
498 | #add_reviewer_input, | |
|
499 | #add_observer_input { | |
|
499 | 500 | padding-top: 10px |
|
500 | 501 | } |
|
501 | 502 |
@@ -177,7 +177,7 b'' | |||
|
177 | 177 | <span class="calculate-reviewers"> |
|
178 | 178 | <h4>${_('loading...')}</h4> |
|
179 | 179 | </span> |
|
180 | ||
|
180 | % if c.rhodecode_edition_id == 'EE': | |
|
181 | 181 | <div id="observers" class="pr-details-content observers"> |
|
182 | 182 | ## members goes here, filled via JS based on initial selection ! |
|
183 | 183 | <input type="hidden" name="__start__" value="observer_members:sequence"> |
@@ -193,7 +193,12 b'' | |||
|
193 | 193 | </div> |
|
194 | 194 | </div> |
|
195 | 195 | </div> |
|
196 | ||
|
196 | % else: | |
|
197 | <h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')|n}</h4> | |
|
198 | <p> | |
|
199 | Pull request observers allows adding users who don't need to leave mandatory votes, but need to be aware about certain changes. | |
|
200 | </p> | |
|
201 | % endif | |
|
197 | 202 | </div> |
|
198 | 203 | |
|
199 | 204 | </div> |
@@ -624,6 +624,7 b'' | |||
|
624 | 624 | </div> |
|
625 | 625 | |
|
626 | 626 | ## OBSERVERS |
|
627 | % if c.rhodecode_edition_id == 'EE': | |
|
627 | 628 | <div class="sidebar-element clear-both"> |
|
628 | 629 | <% vote_title = _ungettext( |
|
629 | 630 | '{} observer without voting right.', |
@@ -674,6 +675,7 b'' | |||
|
674 | 675 | %endif |
|
675 | 676 | </div> |
|
676 | 677 | </div> |
|
678 | % endif | |
|
677 | 679 | |
|
678 | 680 | ## TODOs |
|
679 | 681 | <div class="sidebar-element clear-both"> |
General Comments 0
You need to be logged in to leave comments.
Login now