Mercurial Mercurial > mosatags / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct @editor route
authorymh <ymh.work@gmail.com>
Wed, 28 Apr 2010 17:19:34 +0200
changeset 92 50bc52a9d662
parent 90 3189b5c66e3d
child 93 8e4e2f2a2fdf
correct @editor route
.hgignore file | annotate | diff | comparison | revisions
web/thdProject/apps/frontend/config/routing.yml file | annotate | diff | comparison | revisions
web/thdProject/apps/frontend/modules/search/templates/_searchList.php file | annotate | diff | comparison | revisions
web/thdProject/apps/frontend/modules/search/templates/viewSearchListSuccess.php file | annotate | diff | comparison | revisions
web/thdProject/data/sql/schema.sql file | annotate | diff | comparison | revisions 
--- a/.hgignore	Wed Apr 28 15:24:36 2010 +0200
+++ b/.hgignore	Wed Apr 28 17:19:34 2010 +0200
@@ -32,4 +32,6 @@
 syntax: regexp
 ^web/thdProject/config/databases\.yml$
 syntax: regexp
-^build/deploy_engine\.launch$
\ No newline at end of file
+^build/deploy_engine\.launch$
+syntax: regexp
+^engine/sonyengine/db/.*$
\ No newline at end of file
--- a/web/thdProject/apps/frontend/config/routing.yml	Wed Apr 28 15:24:36 2010 +0200
+++ b/web/thdProject/apps/frontend/config/routing.yml	Wed Apr 28 17:19:34 2010 +0200
@@ -38,7 +38,6 @@
 segmentListJson:
   url: /editeur/:film_slug/segments
   param: { module: editor, action: viewVideoSegmentList }
-  requirements: {ref: \d+}
   
   
 ########
--- a/web/thdProject/apps/frontend/modules/search/templates/_searchList.php	Wed Apr 28 15:24:36 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/search/templates/_searchList.php	Wed Apr 28 17:19:34 2010 +0200
@@ -3,11 +3,10 @@
   <?php
   foreach($searchFilms as $item):
   if ($item != $selectedFilm){
-    $tagFilmUri = url_for('@editor?ref='.$item->getRef().'&film_slug='.$item->getSlugUrl());
+    $tagFilmUri = url_for('@editVideoSegment?film_slug='.$item->getSlugUrl());
   ?>
     <li class="film-item">
       <?php include_component('partials', 'filmItem', Array('film' => $item, 'actionUri' => $tagFilmUri)); ?>
-      <div class="tag-action"><a href="<?php echo $tagFilmUri ?>" class="link-button">Tagger le film</a></div>
     </li>
   <?php
   }
--- a/web/thdProject/apps/frontend/modules/search/templates/viewSearchListSuccess.php	Wed Apr 28 15:24:36 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/search/templates/viewSearchListSuccess.php	Wed Apr 28 17:19:34 2010 +0200
@@ -1,6 +1,6 @@
 <?php
 if($selectedFilm){
-  $tagFilmUri = url_for('@editor?ref='.$selectedFilm->getRef().'&film_slug='.$selectedFilm->getSlugUrl());
+  $tagFilmUri = url_for('@editVideoSegment?film_slug='.$selectedFilm->getSlugUrl());
 
 ?>
 <h3 class="head">Résultats pour : <i><?php echo $text; ?></i></h3>  
--- a/web/thdProject/data/sql/schema.sql	Wed Apr 28 15:24:36 2010 +0200
+++ b/web/thdProject/data/sql/schema.sql	Wed Apr 28 17:19:34 2010 +0200
@@ -1,13 +1,13 @@
 CREATE TABLE thd_film (id INT UNSIGNED AUTO_INCREMENT, ref VARCHAR(255) NOT NULL, title VARCHAR(255) NOT NULL, pitch TEXT NOT NULL, duration INT NOT NULL, directors TEXT NOT NULL, actors TEXT NOT NULL, slug_url VARCHAR(255) NOT NULL, original_title VARCHAR(255), production_countries TEXT NOT NULL, production_year BIGINT, uniqueid VARCHAR(36) NOT NULL, UNIQUE INDEX uniqueidindex_idx (uniqueid), PRIMARY KEY(id)) ENGINE = INNODB;
-CREATE TABLE thd_user (id INT UNSIGNED AUTO_INCREMENT, uniqueid VARCHAR(255) NOT NULL, PRIMARY KEY(id)) ENGINE = INNODB;
-CREATE TABLE thd_segment_tag (id INT UNSIGNED AUTO_INCREMENT, tag_id INT UNSIGNED NOT NULL, segment_id INT UNSIGNED NOT NULL, INDEX segment_id_idx (segment_id), INDEX tag_id_idx (tag_id), PRIMARY KEY(id)) ENGINE = INNODB;
 CREATE TABLE thd_image (id INT UNSIGNED AUTO_INCREMENT, file VARCHAR(255) NOT NULL, film_id INT UNSIGNED NOT NULL, INDEX film_id_idx (film_id), PRIMARY KEY(id)) ENGINE = INNODB;
-CREATE TABLE thd_video (id INT UNSIGNED AUTO_INCREMENT, file VARCHAR(255) NOT NULL, title VARCHAR(255), film_id INT UNSIGNED NOT NULL, INDEX film_id_idx (film_id), PRIMARY KEY(id)) ENGINE = INNODB;
+CREATE TABLE thd_segment (id INT UNSIGNED AUTO_INCREMENT, start DOUBLE NOT NULL, end DOUBLE NOT NULL, user_id INT UNSIGNED NOT NULL, creation_date DATETIME NOT NULL, uniqueid VARCHAR(36) NOT NULL, video_id INT UNSIGNED NOT NULL, UNIQUE INDEX uniqueidindex_idx (uniqueid), INDEX video_id_idx (video_id), INDEX user_id_idx (user_id), PRIMARY KEY(id)) ENGINE = INNODB;
+CREATE TABLE thd_segment_tag (id INT UNSIGNED AUTO_INCREMENT, tag_id INT UNSIGNED NOT NULL, segment_id INT UNSIGNED NOT NULL, INDEX segment_id_idx (segment_id), INDEX tag_id_idx (tag_id), PRIMARY KEY(id)) ENGINE = INNODB;
 CREATE TABLE thd_tag (id INT UNSIGNED AUTO_INCREMENT, tag VARCHAR(255), uniqueid VARCHAR(255) NOT NULL, UNIQUE INDEX uniqueidindex_idx (uniqueid), PRIMARY KEY(id)) ENGINE = INNODB;
-CREATE TABLE thd_segment (id INT UNSIGNED AUTO_INCREMENT, start DOUBLE NOT NULL, end DOUBLE NOT NULL, user_id INT UNSIGNED NOT NULL, creation_date DATETIME NOT NULL, uniqueid VARCHAR(36) NOT NULL, video_id INT UNSIGNED NOT NULL, UNIQUE INDEX uniqueidindex_idx (uniqueid), INDEX video_id_idx (video_id), INDEX user_id_idx (user_id), PRIMARY KEY(id)) ENGINE = INNODB;
+CREATE TABLE thd_user (id INT UNSIGNED AUTO_INCREMENT, uniqueid VARCHAR(255) NOT NULL, PRIMARY KEY(id)) ENGINE = INNODB;
+CREATE TABLE thd_video (id INT UNSIGNED AUTO_INCREMENT, file VARCHAR(255) NOT NULL, title VARCHAR(255), film_id INT UNSIGNED NOT NULL, INDEX film_id_idx (film_id), PRIMARY KEY(id)) ENGINE = INNODB;
+ALTER TABLE thd_image ADD FOREIGN KEY (film_id) REFERENCES thd_film(id) ON DELETE CASCADE;
+ALTER TABLE thd_segment ADD FOREIGN KEY (video_id) REFERENCES thd_video(id) ON DELETE CASCADE;
+ALTER TABLE thd_segment ADD FOREIGN KEY (user_id) REFERENCES thd_user(id) ON DELETE CASCADE;
 ALTER TABLE thd_segment_tag ADD FOREIGN KEY (tag_id) REFERENCES thd_tag(id) ON DELETE CASCADE;
 ALTER TABLE thd_segment_tag ADD FOREIGN KEY (segment_id) REFERENCES thd_segment(id) ON DELETE CASCADE;
-ALTER TABLE thd_image ADD FOREIGN KEY (film_id) REFERENCES thd_film(id) ON DELETE CASCADE;
 ALTER TABLE thd_video ADD FOREIGN KEY (film_id) REFERENCES thd_film(id) ON DELETE CASCADE;
-ALTER TABLE thd_segment ADD FOREIGN KEY (video_id) REFERENCES thd_video(id) ON DELETE CASCADE;
-ALTER TABLE thd_segment ADD FOREIGN KEY (user_id) REFERENCES thd_user(id) ON DELETE CASCADE;
mosatags