[Fmsystem-commits] [8693]

[Erik Holm-Larsen]

Revision: 8693
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8693
Author:   erikhl
Date:     2012-01-26 13:01:25 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soorganization.inc.php
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/activitycalendarfrontend/setup/phpgw_no.lang
    trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php

Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php     2012-01-26 
10:13:57 UTC (rev 8692)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php     2012-01-26 
13:01:25 UTC (rev 8693)
@@ -115,6 +115,10 @@
                                $filter_clauses[] = "org.id = {$id}";
                        }
                }
+               if(isset($filters['edit_from_frontend']))
+               {
+                       $filter_clauses[] = "org.id IN (SELECT organization_id 
from activity_activity)";
+               }
 
 /*
                // All parties with contracts of type X

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-01-26 
10:13:57 UTC (rev 8692)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-01-26 
13:01:25 UTC (rev 8693)
@@ -451,7 +451,7 @@
                                {
                                        //select activity to edit
                                        $activities = 
$this->so_activity->get(null, null, 'title', true, null, null, 
array('activity_state' => 3));
-                                       $organizations = 
$this->so_organization->get(null, null, 'org.name', true, null, null, null);
+                                       $organizations = 
$this->so_organization->get(null, null, 'org.name', true, null, null, 
array('edit_from_frontend' => 'yes'));
                                        return 
$this->render('activity_edit_step_1.php', array
                                                (
                                                        'activities' => 
$activities,

Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang  2012-01-26 10:13:57 UTC 
(rev 8692)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang  2012-01-26 13:01:25 UTC 
(rev 8693)
@@ -91,4 +91,5 @@
 activity_edit_helptext activitycalendarfrontend        no      Velg 
aktiviteten du ønsker å endre fra listen under.
 send_change_request    activitycalendarfrontend        no      Send inn 
endringsønske
 edit_organization      activitycalendarfrontend        no      Rediger 
organisasjonsinformasjon
-address        activitycalendarfrontend        no      Adresse
\ No newline at end of file
+address        activitycalendarfrontend        no      Adresse
+activity_edit_helptext_step1   activitycalendarfrontend        no      Skal du 
endre opplysninger knyttet til en aktivitet må du være registrert som 
kontaktperson for organisasjonen.<br/>Du velger organisasjon og aktivitet i 
bildet under, og får en e-post i retur med en lenke til endringsskjema.
\ No newline at end of file

Modified: trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php      
2012-01-26 10:13:57 UTC (rev 8692)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php      
2012-01-26 13:01:25 UTC (rev 8693)
@@ -44,6 +44,7 @@
        <form action="#" method="post">
                <dl class="proplist-col" style="width: 200%">
                        <dt>
+                               <?php echo 
lang('activity_edit_helptext_step1')?><br/><br/>
                                <?php echo 
lang('activity_org_helptext_step1')?><br/><br/>
                        </dt>
                        <dd>