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

Fix #135 : substitution of a story image

Browse Source
This commit is contained in:
Romain Neutron
2011-12-30 11:59:31 +01:00
parent d0fc37b957
commit 9ea7c19c92
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/media/subdef.class.php
View File

@@ -192,6 +192,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$this->path = $registry->get('GV_RootPath') . 'www/skins/icons/'; $this->path = $registry->get('GV_RootPath') . 'www/skins/icons/';
$this->file = 'deleted.png'; $this->file = 'deleted.png';
$this->is_physically_present = false; $this->is_physically_present = false;
$this->is_substituted = true;
} }
if (!$row || !file_exists($this->path . $this->file)) if (!$row || !file_exists($this->path . $this->file))
{ {
@@ -204,6 +205,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$this->path = $registry->get('GV_RootPath') $this->path = $registry->get('GV_RootPath')
. 'www/skins/icons/substitution/'; . 'www/skins/icons/substitution/';
$this->file = 'regroup_thumb.png'; $this->file = 'regroup_thumb.png';
$this->is_substituted = true;
} }
else else
{ {
@@ -217,6 +219,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$this->path = $registry->get('GV_RootPath') $this->path = $registry->get('GV_RootPath')
. 'www/skins/icons/substitution/'; . 'www/skins/icons/substitution/';
$this->file = str_replace('+', '%20', $mime) . '.png'; $this->file = str_replace('+', '%20', $mime) . '.png';
$this->is_substituted = true;
} }
$this->is_physically_present = false; $this->is_physically_present = false;
if (!file_exists($this->path . $this->file)) if (!file_exists($this->path . $this->file))
@@ -225,6 +228,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$this->path = $registry->get('GV_RootPath') $this->path = $registry->get('GV_RootPath')
. 'www/skins/icons/'; . 'www/skins/icons/';
$this->file = 'substitution.png'; $this->file = 'substitution.png';
$this->is_substituted = true;
} }
} }

4
lib/classes/module/prod/route/records/edit.class.php
View File

@@ -436,7 +436,7 @@ class module_prod_route_records_edit extends module_prod_route_records_abstract
try try
{ {
$reg_record = $this->get_grouping_head(); $reg_record = $this->get_grouping_head();
$reg_sbas_id = $reg_record->get_base_id(); $reg_sbas_id = $reg_record->get_sbas_id();
$newsubdef_reg = new record_adapter($reg_sbas_id, $request->get('newrepresent')); $newsubdef_reg = new record_adapter($reg_sbas_id, $request->get('newrepresent'));
@@ -452,7 +452,7 @@ class module_prod_route_records_edit extends module_prod_route_records_abstract
} }
catch (Exception $e) catch (Exception $e)
{ {
} }
} }

6
lib/classes/record/adapter.class.php
View File

@@ -968,6 +968,12 @@ class record_adapter implements record_Interface, cache_cacheableInterface
try try
{ {
$value = $this->get_subdef($name); $value = $this->get_subdef($name);
if ($value->is_substituted())
{
throw new Exception('Cannot replace a substitution');
}
$original_file = p4string::addEndSlash($value->get_path()) . $value->get_file(); $original_file = p4string::addEndSlash($value->get_path()) . $value->get_file();
unlink($original_file); unlink($original_file);
} }