Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Chill-project/Main

Browse Source
This commit is contained in:
Marc Ducobu 2015-07-06 09:51:20 +02:00
commit 294fc49df7
6 changed files with 1066 additions and 1027 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2060
Resources/public/css/scratch.css
View File

File diff suppressed because it is too large Load Diff

2
Resources/public/css/scratch.css.map
View File

File diff suppressed because one or more lines are too long

14
Resources/public/sass/_custom.scss
View File

@ -92,4 +92,18 @@ ul.custom_fields.choice li {
p {
font-family: 'open_sanslight';
}
}
// inline time input
.time_compound {
input[type=text], select {
width: 4em;
display: inline-block;
text-align: center;
}
.separator {
margin-left: 0.2em;
margin-right: 0.2em;
}
}

12
Resources/views/Form/fields.html.twig
View File

@ -87,6 +87,18 @@
{% endif %}
{% endspaceless %}
{% endblock date_widget %}
{%- block time_widget -%}
{%- if widget == 'single_text' -%}
{{ block('form_widget_simple') }}
{%- else -%}
{%- set vars = widget == 'text' ? { 'attr': { 'size': 1 }} : {} -%}
{% set attr = {'class' : 'time_compound ' ~ attr.class|default('') } %}
<div {{ block('widget_container_attributes') }}>
{{ form_widget(form.hour, vars) }}{% if with_minutes %}<span class="separator">:</span>{{ form_widget(form.minute, vars) }}{% endif %}{% if with_seconds %}<span class="separator">:</span>{{ form_widget(form.second, vars) }}{% endif %}
</div>
{%- endif -%}
{%- endblock time_widget -%}
{% block form_errors %}
{% spaceless %}

3
Security/Authorization/AuthorizationHelper.php
View File

@ -106,6 +106,9 @@ class AuthorizationHelper
// perform check on scope if necessary
if ($entity instanceof HasScopeInterface) {
$scope = $entity->getScope();
if ($scope === NULL) {
return true;
}
if ($scope->getId() === $roleScope
->getScope()->getId()) {
return true;

2
Timeline/TimelineBuilder.php
View File

@ -130,7 +130,7 @@ class TimelineBuilder implements ContainerAwareInterface
$union .= $append;
}
//add ORDER BY clause and LIMIT
$union .= sprintf(' ORDER BY date LIMIT %d OFFSET %d',
$union .= sprintf(' ORDER BY date DESC LIMIT %d OFFSET %d',
$number, $page * $number);
return $union;