Browse Source

Adaptation de findBySearch (Element) pour limiter aux groupes suivis lorsque mynetwork.

bastien 13 years ago
parent
commit
0311e04af9

+ 2 - 0
src/Muzich/CoreBundle/DataFixtures/ORM/LoadElementData.php View File

50
     $element->setType($type);
50
     $element->setType($type);
51
     $element->setOwner($owner);
51
     $element->setOwner($owner);
52
     $element->setDateAdded($date);
52
     $element->setDateAdded($date);
53
+    if ($group)
54
+      $element->setGroup($group);
53
     $this->addReference('element_'.$reference_id, $element);
55
     $this->addReference('element_'.$reference_id, $element);
54
     
56
     
55
     foreach ($tags as $tag)
57
     foreach ($tags as $tag)

+ 14 - 4
src/Muzich/CoreBundle/Repository/ElementRepository.php View File

40
       case ElementSearcher::NETWORK_PERSONAL:
40
       case ElementSearcher::NETWORK_PERSONAL:
41
         
41
         
42
         $join_personal = "
42
         $join_personal = "
43
-          JOIN eu.followers_users f WITH f.follower = :userid
44
-        ";
43
+          LEFT JOIN eu.followers_users f WITH f.follower = :userid "
44
+          ."LEFT JOIN g.followers gf WITH gf.follower = :useridg"
45
+          ;
45
         $params['userid'] = $user_id;
46
         $params['userid'] = $user_id;
47
+        $params['useridg'] = $user_id;
46
         
48
         
47
       break;
49
       break;
48
     }
50
     }
60
     
62
     
61
     $query_join2 = ' JOIN e.owner';
63
     $query_join2 = ' JOIN e.owner';
62
     
64
     
63
-    $query_string = "SELECT e, et, t, eu 
65
+    $query_string = "SELECT e, et, t, eu, g
64
       FROM MuzichCoreBundle:Element e 
66
       FROM MuzichCoreBundle:Element e 
65
-      JOIN e.type et JOIN e.tags t $query_with JOIN e.owner eu $join_personal
67
+      LEFT JOIN e.group g JOIN e.type et JOIN e.tags t $query_with 
68
+        JOIN e.owner eu $join_personal
66
       ORDER BY e.date_added DESC "
69
       ORDER BY e.date_added DESC "
67
     ;
70
     ;
68
     
71
     
72
+//    $query_string = "
73
+//      SELECT e, g
74
+//      FROM MuzichCoreBundle:Element e 
75
+//      LEFT JOIN e.group g
76
+//      ORDER BY e.date_added DESC
77
+//    ";
78
+    
69
     $query = $this->getEntityManager()
79
     $query = $this->getEntityManager()
70
       ->createQuery($query_string)
80
       ->createQuery($query_string)
71
       ->setParameters($params)
81
       ->setParameters($params)

+ 6 - 3
src/Muzich/CoreBundle/Resources/views/SearchElement/default.html.twig View File

1
 <ul>
1
 <ul>
2
   {% for element in elements %} 
2
   {% for element in elements %} 
3
     <li>
3
     <li>
4
-      {{element.name}} ({{element.owner.username}})
5
-        <a href="{{element.url}}" target="_blank">link</a>
4
+      {% if element.group %}
5
+        <b>({{ element.group.name }})</b>
6
+      {% endif %}
7
+      {{ element.name }} ({{ element.owner.username }})
8
+        <a href="{{ element.url }}" target="_blank">link</a>
6
         <ul>
9
         <ul>
7
           {% for tag in element.tags %} 
10
           {% for tag in element.tags %} 
8
             <li>
11
             <li>
9
-              {{tag.name}}
12
+              {{ tag.name }}
10
             </li>
13
             </li>
11
           {% endfor %} 
14
           {% endfor %} 
12
         </ul>
15
         </ul>