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

Merge branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2013-09-19 14:53:55 +02:00
parent 45c5276923 b7d93e780d
commit 0b9c8b64ac
12 changed files with 1952 additions and 1749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/databox.php
View File

@@ -148,7 +148,7 @@ class databox extends base
}
if (!$row) {
throw new NotFoundHttpException(sprintf('databox %d not found', $sbas_id));
throw new NotFoundHttpException(sprintf('databox %d not found', $this->id));
}
$this->ord = $row['ord'];

22
lib/classes/module/report/dashboard/feed.php
View File

@@ -72,7 +72,10 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
$cache_id = 'feed_' . md5($sbasid . '_' . $sbas_coll . '_' . $dmin . '_' . $dmax);
try {
return $app['phraseanet.appbox']->get_data_from_cache($cache_id);
$result = $app['phraseanet.appbox']->get_data_from_cache($cache_id);
$result->setApplication($app);
return $result;
} catch (Exception $e) {
}
@@ -231,4 +234,21 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
return false;
}
}
private function setApplication(Application $app)
{
$this->app = $app;
}
public function __sleep()
{
$vars = array();
foreach ($this as $key => $value) {
if (in_array($key, array('app')))
continue;
$vars[] = $key;
}
return $vars;
}
}

119
lib/classes/patch/380a3.php
View File

@@ -58,71 +58,70 @@ class patch_380a3 implements patchInterface
{
$conn = $databox->get_connection();
try {
$removeProc = "DROP PROCEDURE IF EXISTS explode_log_table";
$removeProc = "DROP PROCEDURE IF EXISTS explode_log_table";
$stmt = $conn->prepare($removeProc);
$stmt->execute();
$stmt->closeCursor();
unset($stmt);
$stmt = $conn->prepare($removeProc);
$stmt->execute();
$stmt->closeCursor();
unset($stmt);
$procedure = "
CREATE PROCEDURE explode_log_table(bound VARCHAR(255))
BEGIN
DECLARE l_log_id INT UNSIGNED DEFAULT 0;
DECLARE l_coll_list TEXT;
DECLARE occurance INT DEFAULT 0;
DECLARE i INT DEFAULT 0;
DECLARE dest_coll_id INT;
DECLARE done INT DEFAULT 0;
DECLARE result_set CURSOR FOR
SELECT l.id, l.coll_list
FROM log l
LEFT JOIN log_colls lc ON (lc.log_id = l.id)
WHERE (lc.log_id IS NULL) AND coll_list != '';
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
OPEN result_set;
read_loop: LOOP
FETCH result_set INTO l_log_id, l_coll_list;
IF done THEN
LEAVE read_loop;
END IF;
SET occurance = (SELECT LENGTH(l_coll_list) - LENGTH(REPLACE(l_coll_list, bound, ''))+1);
SET i=1;
START TRANSACTION;
WHILE i <= occurance DO
SET dest_coll_id = (SELECT REPLACE(
SUBSTRING(
SUBSTRING_INDEX(l_coll_list, bound, i),
LENGTH(SUBSTRING_INDEX(l_coll_list, bound, i - 1)) + 1
),
',',
''
));
IF dest_coll_id > 0 THEN
INSERT INTO log_colls VALUES (null, l_log_id, dest_coll_id);
END IF;
SET i = i + 1;
END WHILE;
COMMIT;
END LOOP;
CLOSE result_set;
END;";
$procedure = "
CREATE PROCEDURE explode_log_table(bound VARCHAR(255))
BEGIN
DECLARE l_log_id INT UNSIGNED DEFAULT 0;
DECLARE l_coll_list TEXT;
DECLARE occurance INT DEFAULT 0;
DECLARE i INT DEFAULT 0;
DECLARE dest_coll_id INT;
DECLARE done INT DEFAULT 0;
DECLARE result_set CURSOR FOR
SELECT l.id, l.coll_list
FROM log l
LEFT JOIN log_colls lc ON (lc.log_id = l.id)
WHERE (lc.log_id IS NULL) AND coll_list != '';
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
OPEN result_set;
read_loop: LOOP
FETCH result_set INTO l_log_id, l_coll_list;
IF done THEN
LEAVE read_loop;
END IF;
SET occurance = (SELECT LENGTH(l_coll_list) - LENGTH(REPLACE(l_coll_list, bound, ''))+1);
SET i=1;
START TRANSACTION;
WHILE i <= occurance DO
SET dest_coll_id = (SELECT REPLACE(
SUBSTRING(
SUBSTRING_INDEX(l_coll_list, bound, i),
LENGTH(SUBSTRING_INDEX(l_coll_list, bound, i - 1)) + 1
),
',',
''
));
IF dest_coll_id > 0 THEN
INSERT INTO log_colls VALUES (null, l_log_id, dest_coll_id);
END IF;
SET i = i + 1;
END WHILE;
COMMIT;
END LOOP;
CLOSE result_set;
END;";
$stmt = $conn->prepare($procedure);
$stmt->execute();
$stmt->closeCursor();
unset($stmt);
$stmt = $conn->prepare($procedure);
$stmt->execute();
$stmt->closeCursor();
$sql = "CALL explode_log_table(',')";
$stmt = $conn->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
unset($stmt);
} catch (\PDOEXception $e) {
return false;
}
$sql = "CALL explode_log_table(',')";
$stmt = $conn->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
$stmt = $conn->prepare($removeProc);
$stmt->execute();
$stmt->closeCursor();
return true;
}
}

BIN
locale/de_DE/LC_MESSAGES/phraseanet.mo
View File

Binary file not shown.

491
locale/de_DE/LC_MESSAGES/phraseanet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/en_GB/LC_MESSAGES/phraseanet.mo
View File

Binary file not shown.

437
locale/en_GB/LC_MESSAGES/phraseanet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/fr_FR/LC_MESSAGES/phraseanet.mo
View File

Binary file not shown.

443
locale/fr_FR/LC_MESSAGES/phraseanet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/nl_NL/LC_MESSAGES/phraseanet.mo
View File

Binary file not shown.

2175
locale/nl_NL/LC_MESSAGES/phraseanet.po
View File

File diff suppressed because it is too large Load Diff

12
www/skins/prod/Basket.css
View File

@@ -1,3 +1,9 @@
#BasketBrowser h1 {
font-size: 14px;
line-height: 20px;
margin: 0;
padding: 0;
}
#BasketBrowser .Browser{
background-color: #111111;
}
@@ -13,6 +19,9 @@
position:relative;
height:100px;
}
#BasketBrowser .result .PNB10 {
overflow: hidden;
}
#BasketBrowser .results .datas{
top:50px;
@@ -49,6 +58,7 @@
box-shadow: none;
line-height: 18px;
text-align: center;
vertical-align:top;
}
#BasketBrowser .result td.thumbnail .counter{
@@ -120,4 +130,4 @@
}
#BasketBrowser form ul li label{
margin: 0 0 0 40px;
}
}