hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename get_number/set_number to getNumber/setNumber

Browse Source
This commit is contained in:
Benoît Burnichon
2015-07-13 17:04:02 +02:00
parent e14b2155aa
commit 38ae7bc2ac
20 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Controller/LightboxController.php
View File

@@ -96,7 +96,7 @@ class LightboxController extends Controller
$basket = $basketElement->getBasket();
$ret = [];
$ret['number'] = $basketElement->getRecord($this->app)->get_number();
$ret['number'] = $basketElement->getRecord($this->app)->getNumber();
$ret['title'] = $basketElement->getRecord($this->app)->get_title();
$ret['preview'] = $this->render(
@@ -143,7 +143,7 @@ class LightboxController extends Controller
}
$ret = [];
$ret['number'] = $record->get_number();
$ret['number'] = $record->getNumber();
$ret['title'] = $record->get_title();
$ret['preview'] = $this->render('common/preview.html.twig', [
'record' => $record,

2
lib/Alchemy/Phrasea/Controller/Prod/EditController.php
View File

@@ -144,7 +144,7 @@ class EditController extends Controller
/** @var \record_adapter $record */
foreach ($records as $record) {
$indice = $record->get_number();
$indice = $record->getNumber();
$elements[$indice] = [
'bid' => $record->get_base_id(),
'rid' => $record->get_record_id(),

2
lib/Alchemy/Phrasea/Controller/Prod/RecordController.php
View File

@@ -104,7 +104,7 @@ class RecordController extends Controller
"tools" => $this->render('prod/preview/tools.html.twig', [
'record' => $record,
]),
"pos" => $record->get_number(),
"pos" => $record->getNumber(),
"title" => str_replace(array('[[em]]', '[[/em]]'), array('<em>', '</em>'), $record->get_title($query, $searchEngine)),
"collection_name" => $record->get_collection()->get_name(),
"collection_logo" => $record->get_collection()->getLogo($record->get_base_id(), $this->app),

2
lib/Alchemy/Phrasea/Controller/RecordsRequest.php
View File

@@ -65,7 +65,7 @@ class RecordsRequest extends ArrayCollection
$i = 0;
$records = $this->toArray();
array_walk($records, function ($record) use (&$i) {
$record->set_number($i++);
$record->setNumber($i++);
});
}

6
lib/Alchemy/Phrasea/Out/Module/PDF.php
View File

@@ -75,7 +75,7 @@ class PDF
break;
}
$record->set_number(count($list) + 1);
$record->setNumber(count($list) + 1);
$list[] = $record;
}
@@ -194,7 +194,7 @@ class PDF
if ($links) {
$lk = $this->pdf->AddLink();
$this->pdf->SetLink($lk, 0, $npages + $rec->get_number());
$this->pdf->SetLink($lk, 0, $npages + $rec->getNumber());
$this->pdf->Image(
$fimg
, $x + (($DiapoW - $wimg) / 2)
@@ -327,7 +327,7 @@ class PDF
$this->pdf->AddPage();
if ($withtdm === "CALCPAGES") {
$rec->set_number($this->pdf->PageNo());
$rec->setNumber($this->pdf->PageNo());
}
$lmargin = $this->pdf->GetX();
$himg = 0;

8
lib/classes/record/adapter.php
View File

@@ -150,7 +150,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
/**
* @return int
*/
public function get_number()
public function getNumber()
{
return $this->number;
}
@@ -158,10 +158,10 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
/**
* Set a relative number (order) for the current in its set
*
* @param int $number
* @return record_adapter
* @param int $number
* @return $this
*/
public function set_number($number)
public function setNumber($number)
{
$this->number = (int) $number;

10
lib/classes/record/preview.php
View File

@@ -129,7 +129,7 @@ class record_preview extends record_adapter
$sbas_id = $child->get_sbas_id();
$this->original_item = $child;
$record_id = $child->get_record_id();
if ($child->get_number() == $pos)
if ($child->getNumber() == $pos)
break;
}
$number = $pos;
@@ -277,20 +277,20 @@ class record_preview extends record_adapter
switch ($this->env) {
case "RESULT":
$this->title .= $this->app->trans('resultat numero %number%', ['%number%' => '<span id="current_result_n">' . ($this->get_number() + 1) . '</span> : ']);
$this->title .= $this->app->trans('resultat numero %number%', ['%number%' => '<span id="current_result_n">' . ($this->getNumber() + 1) . '</span> : ']);
$this->title .= parent::get_title($highlight, $searchEngine);
break;
case "BASK":
$this->title .= $this->name . ' - ' . parent::get_title($highlight, $searchEngine)
. ' (' . $this->get_number() . '/' . $this->total . ') ';
. ' (' . $this->getNumber() . '/' . $this->total . ') ';
break;
case "REG":
$title = parent::get_title();
if ($this->get_number() == 0) {
if ($this->getNumber() == 0) {
$this->title .= $title;
} else {
$this->title .= sprintf(
'%s %s', $title, $this->get_number() . '/' . $this->total
'%s %s', $title, $this->getNumber() . '/' . $this->total
);
}
break;

2
templates/web/client/answers.html.twig
View File

@@ -161,7 +161,7 @@
{% if record.is_grouping %}
{% set on_click_html = "openPreview('REG',0, '" ~ record.get_serialize_key() ~ "');" %}
{% else %}
{% set on_click_html = "openPreview('RESULT','" ~ record.get_number() ~ "');" %}
{% set on_click_html = "openPreview('RESULT','" ~ record.getNumber() ~ "');" %}
{% endif %}
{% if mod_col == 1 %}

4
templates/web/client/baskets.html.twig
View File

@@ -94,13 +94,13 @@
{% set tooltip = '' %}
{% if app['conf'].get(['registry', 'classic', 'basket-rollover']) %}
{% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.get_number() }) %}
{% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.getNumber() }) %}
{% endif %}
<div class="diapochu">
<div class="image">
<img
onclick="openPreview('BASK',{{ record.get_number() }}, {{ selected_basket.getId() }}); return(false);"
onclick="openPreview('BASK',{{ record.getNumber() }}, {{ selected_basket.getId() }}); return(false);"
{% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %}
style="position:relative; top:{{ top }}px; {{ dim }}"
class="{{ thumbnail.get_height() > 42 ? 'hThumbnail' : 'vThumbnail' }} baskTips"

2
templates/web/lightbox/IE6/sc_container.html.twig
View File

@@ -5,7 +5,7 @@
<div class="basket_element_wrapper">
<a href="{{ path('lightbox_ajax_load_basketelement', { 'sselcont_id' : element.getId() }) }}">
<div id="scid_{{element.getId()}}" class="basket_element ui-corner-all {% if basket_element and basket_element.getId() == element.getId() %}selected{% endif %}">
<div class="display_id">{{element.getRecord(app).get_number()}}</div>
<div class="display_id">{{element.getRecord(app).getNumber()}}</div>
{% if basket.getValidation() %}
<div class="agreement">
<img src="/skins/lightbox/agree.png"

4
templates/web/lightbox/sc_container.html.twig
View File

@@ -5,8 +5,8 @@
<div class="basket_element_wrapper">
<a href="{{ path('lightbox_ajax_load_basketelement', { 'sselcont_id' : element.getId() }) }}">
<div id="scid_{{element.getId()}}" class="basket_element ui-corner-all {% if basket_element and basket_element.getId() == element.getId() %}selected{% endif %}">
{% set record = element.getRecord(app).set_number(loop.index) %}
<div class="display_id">{{record.get_number()}}</div>
{% set record = element.getRecord(app).setNumber(loop.index) %}
<div class="display_id">{{record.getNumber()}}</div>
{% if basket.getValidation() %}
<div class="agreement">
<img src="/skins/lightbox/agree.png"

4
templates/web/prod/Story/Reorder.html.twig
View File

@@ -12,7 +12,7 @@
</form>
<form style="display:inline-block;" class="form-inline" name="reorder" method="POST" action="{{ path('prod_stories_story_reorder', { 'sbas_id' : story.get_sbas_id(), 'record_id' : story.get_record_id() }) }}">
{% for element in story.get_children() %}
<input type="hidden" name="element[{{ element.get_record_id() }}]" value="{{ element.get_number() }}"/>
<input type="hidden" name="element[{{ element.get_record_id() }}]" value="{{ element.getNumber() }}"/>
{% endfor %}
<button>{{ 'boutton::valider' | trans }}</button>
</form>
@@ -28,7 +28,7 @@
<form style="display:none;">
<input type="hidden" name="id" value="{{ element.get_record_id() }}"/>
<input type="hidden" name="title" value="{{ element.get_title() }}"/>
<input type="hidden" name="default" value="{{ element.get_number() }}"/>
<input type="hidden" name="default" value="{{ element.getNumber() }}"/>
</form>
</div>
{% endfor %}

4
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -294,7 +294,7 @@
</div>
{% endif %}
<div style="position:absolute;background-color:#959595;color:black;font-weight:bold;padding:3px;z-index:90;">
{{record.get_number()}}
{{record.getNumber()}}
</div>
{{thumbnail.format(record.get_thumbnail,82,82, '', true, false)}}
<div class="bottom">
@@ -312,7 +312,7 @@
X
</a>
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %}
<div class="captionRolloverTips" tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.get_number() }) }}"></div>
<div class="captionRolloverTips" tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.getNumber() }) }}"></div>
{% endif %}
</div>
</div>

2
templates/web/prod/WorkZone/Story.html.twig
View File

@@ -75,7 +75,7 @@
{% for record in Story.get_children().get_elements() %}
<span class="wrapCHIM_{{ record.get_serialize_key() }}">
{{ Macros.element('groupings', Story, record, record, record.get_number()) }}
{{ Macros.element('groupings', Story, record, record, record.getNumber()) }}
</span>
{% endfor %}
</div>

2
templates/web/prod/actions/edit_default.html.twig
View File

@@ -8,7 +8,7 @@
{% set cont_height = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'editing_images_size') %}
{% endif %}
{% set i = record.get_number() %}
{% set i = record.getNumber() %}
{% set thumbnail = record.get_thumbnail().get_url() %}
{% set ratio = 80 %}
{% set width = record.get_thumbnail().get_width() %}

2
templates/web/prod/preview/basket_train.html.twig
View File

@@ -29,7 +29,7 @@
)
%}
<li class="{% if record.get_number == element.ord %}selected{% endif %} prevTrainCurrent">
<li class="{% if record.getNumber == element.ord %}selected{% endif %} prevTrainCurrent">
<img {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}
tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record_item.databoxId, 'record_id' : record_item.recordId, 'context' : 'basket' }) }}"
{% endif %}

2
templates/web/prod/preview/feed_train.html.twig
View File

@@ -28,7 +28,7 @@
)
%}
<li class="{% if record.get_number == item.ord %}selected{% endif %} prevTrainCurrent">
<li class="{% if record.getNumber == item.ord %}selected{% endif %} prevTrainCurrent">
<img {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}
tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' :record_item.databoxId, 'record_id' : record_item.recordId }) }}"
{% endif %}

4
templates/web/prod/preview/reg_train.html.twig
View File

@@ -63,8 +63,8 @@
)
%}
<li class="{% if loop.index == record.get_number %}selected{% endif %} prevTrainCurrent" style="">
<img {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record_item.databoxId, 'record_id' : record_item.recordId, 'context' : 'preview', 'number' : record_item.get_number }) }}"{% endif %}
<li class="{% if loop.index == record.getNumber %}selected{% endif %} prevTrainCurrent" style="">
<img {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record_item.databoxId, 'record_id' : record_item.recordId, 'context' : 'preview', 'number' : record_item.getNumber }) }}"{% endif %}
jsargs="REG|{{loop.index}}|{{story.get_serialize_key}}"
class="openPreview prevRegToolTip" src="{{url}}"
style="

4
templates/web/prod/results/item.html.twig
View File

@@ -6,7 +6,7 @@
sbas="{{ record.databoxId }}"
id="{{'PUBLI_' ~ entry.id ~ '_' ~ record.id }}"
class="IMGT diapo type-{{ record.type }}"
onDblClick="openPreview('FEED',{{ record.get_number }},{{ entry.id }});"
onDblClick="openPreview('FEED',{{ record.getNumber }},{{ entry.id }});"
>
<div style="padding: 4px;">
<div style="height:40px; position: relative; z-index: 95;margin-bottom:0;border-bottom:none;">
@@ -66,7 +66,7 @@
class="previewTips"></div>
{% endif %}
{% if rollover_thumbnail == 'preview' %}
<div tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.get_number }) }}"
<div tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.getNumber }) }}"
class="captionRolloverTips"></div>
{% endif %}
{% if technical_display == '1' %}

23
tests/classes/record/adapterTest.php
View File

@@ -121,22 +121,17 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
);
}
public function testGet_number()
public function testNumber()
{
$record_1 = $this->getRecord1();
$record_1->set_number(24);
$this->assertEquals(24, $record_1->get_number());
$record_1->set_number(42);
$this->assertEquals(42, $record_1->get_number());
$record_1->set_number(0);
$this->assertEquals(0, $record_1->get_number());
$record_1->set_number(null);
$this->assertEquals(0, $record_1->get_number());
}
public function testSet_number()
{
$this->testGet_number();
$record_1->setNumber(24);
$this->assertEquals(24, $record_1->getNumber());
$record_1->setNumber(42);
$this->assertEquals(42, $record_1->getNumber());
$record_1->setNumber(0);
$this->assertEquals(0, $record_1->getNumber());
$record_1->setNumber(null);
$this->assertEquals(0, $record_1->getNumber());
}
public function testSet_type()