[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6647] merge 6644:6646 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6647] merge 6644:6646 from trunk |
|
Date: |
Mon, 06 Dec 2010 14:05:15 +0000 |
Revision: 6647
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6647
Author: sigurdne
Date: 2010-12-06 14:05:15 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
merge 6644:6646 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.bobuilding.inc.php
branches/Version-1_0-branch/booking/inc/class.sobuilding.inc.php
branches/Version-1_0-branch/booking/inc/class.soevent.inc.php
branches/Version-1_0-branch/booking/inc/class.uibuilding.inc.php
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/booking/setup/setup.inc.php
branches/Version-1_0-branch/booking/setup/tables_current.inc.php
branches/Version-1_0-branch/booking/setup/tables_update.inc.php
branches/Version-1_0-branch/booking/templates/base/account_code_dimension.xsl
branches/Version-1_0-branch/booking/templates/base/building_form.xsl
branches/Version-1_0-branch/booking/templates/base/event_edit.xsl
branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
branches/Version-1_0-branch/bookingfrontend/inc/class.uibuilding.inc.php
branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
branches/Version-1_0-branch/bookingfrontend/templates/base/building.xsl
branches/Version-1_0-branch/bookingfrontend/templates/base/building_schedule.xsl
branches/Version-1_0-branch/login.php
branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646
Modified: branches/Version-1_0-branch/booking/inc/class.bobuilding.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.bobuilding.inc.php
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/inc/class.bobuilding.inc.php
2010-12-06 14:05:15 UTC (rev 6647)
@@ -20,7 +20,7 @@
),
booking_sopermission::ROLE_CASE_OFFICER
=> array
(
- 'write' =>
array_fill_keys(array('name', 'homepage', 'description', 'email', 'phone',
'street', 'zip_code', 'city',
'district','deactivate_application','deactivate_calendar'), true),
+ 'write' =>
array_fill_keys(array('name', 'homepage', 'description', 'email', 'phone',
'street', 'zip_code', 'city',
'district','deactivate_application','deactivate_calendar','deactivate_sendmessage'),
true),
),
'global' => array
(
Modified: branches/Version-1_0-branch/booking/inc/class.sobuilding.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.sobuilding.inc.php
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/inc/class.sobuilding.inc.php
2010-12-06 14:05:15 UTC (rev 6647)
@@ -15,6 +15,7 @@
'email' => array('type' => 'string'),
'deactivate_calendar' => array('type'
=> 'int'),
'deactivate_application' =>
array('type' => 'int'),
+ 'deactivate_sendmessage' =>
array('type' => 'int'),
'location_code' =>array('type' =>
'string', 'required' => false),
'street' => array('type'
=> 'string', 'query' => true),
'zip_code' => array('type'
=> 'string'),
Modified: branches/Version-1_0-branch/booking/inc/class.soevent.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.soevent.inc.php
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/inc/class.soevent.inc.php
2010-12-06 14:05:15 UTC (rev 6647)
@@ -80,7 +80,8 @@
return False;
}
return array('id' => $this->db->f('id', false),
- 'name' => $this->db->f('name',
false));
+ 'name' => $this->db->f('name',
false),
+ 'email' =>
$this->db->f('email', false));
}
function get_resource_info($id)
Modified: branches/Version-1_0-branch/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uibuilding.inc.php
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/inc/class.uibuilding.inc.php
2010-12-06 14:05:15 UTC (rev 6647)
@@ -26,7 +26,7 @@
$this->bo = CreateObject('booking.bobuilding');
self::set_active_menu('booking::buildings');
- $this->fields = array('name', 'homepage',
'description', 'email', 'street', 'zip_code', 'city', 'district', 'phone',
'active', 'location_code','deactivate_application','deactivate_calendar');
+ $this->fields = array('name', 'homepage',
'description', 'email', 'street', 'zip_code', 'city', 'district', 'phone',
'active',
'location_code','deactivate_application','deactivate_calendar','deactivate_sendmessage');
}
public function properties()
@@ -177,7 +177,7 @@
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
$building = array_merge($building,
extract_values($_POST, $this->fields));
-
+
$errors = $this->bo->validate($building);
if(!$errors)
{
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2010-12-06
14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2010-12-06
14:05:15 UTC (rev 6647)
@@ -480,5 +480,9 @@
Send warning to building responsible booking no Send e-post til
ansvarlig på bygget
Optional e-mail adress booking no Valgfri e-post adresse
Message about new event booking no Melding om nytt arrangement
-Deactivate application booking no Inaktiver kalender (frontend)
-Deactivate calendar booking no Inaktiver søknad (frontend)
+Deactivate application booking no Inaktiver søknad (frontend)
+Deactivate calendar booking no Inaktiver kalender (frontend)
+Deactivate send message booking no Inaktiver send beskjed
(frontend)
+Can not repeat from a date in the past booking no Du kan ikke repetere
fra en dato i fortiden.
+Can not create a booking in the past booking no Du kan ikke opprette en
booking i fortiden.
+Allocations with existing allocations or bookings (%1) booking no
Tildeinger med eksisterende tildelinger eller bookinger (%1)
Modified: branches/Version-1_0-branch/booking/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/setup.inc.php 2010-12-06
14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/setup/setup.inc.php 2010-12-06
14:05:15 UTC (rev 6647)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.02';
+ $setup_info['booking']['version'] = '0.2.03';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/booking/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2010-12-06 14:05:15 UTC (rev 6647)
@@ -21,6 +21,7 @@
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
'deactive_calendar' => array('type' => 'int',
'nullable' => False,'precision' => '4', 'default' => 0),
'deactive_application' => array('type' =>
'int', 'nullable' => False,'precision' => '4', 'default' => 0),
+ 'deactive_sendmessage' => array('type' =>
'int', 'nullable' => False,'precision' => '4', 'default' => 0),
'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
'homepage' => array('type' => 'text',
'nullable' => False),
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => True),
Modified: branches/Version-1_0-branch/booking/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2010-12-06 14:05:15 UTC (rev 6647)
@@ -2406,6 +2406,8 @@
$GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE $table SET
deactivate_calendar = 0");
$GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
$table ADD COLUMN deactivate_application int NOT NULL DEFAULT 0");
$GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE $table SET
deactivate_application = 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
$table ADD COLUMN deactivate_sendmessage int NOT NULL DEFAULT 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE $table SET
deactivate_sendmessage = 0");
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
{
@@ -2414,3 +2416,21 @@
}
}
+ $test[] = '0.2.02';
+ function booking_upgrade0_2_02()
+ {
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $table = "bb_building";
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
$table ADD COLUMN deactivate_sendmessage int NOT NULL DEFAULT 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE $table SET
deactivate_sendmessage = 0");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.03';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
Modified:
branches/Version-1_0-branch/booking/templates/base/account_code_dimension.xsl
===================================================================
---
branches/Version-1_0-branch/booking/templates/base/account_code_dimension.xsl
2010-12-06 14:02:34 UTC (rev 6646)
+++
branches/Version-1_0-branch/booking/templates/base/account_code_dimension.xsl
2010-12-06 14:05:15 UTC (rev 6647)
@@ -12,6 +12,12 @@
<form action="" method="POST">
<dl class="form-col">
+ <dt><label for="field_article">Article (pos 283 - 297)</label></dt>
+ <dd>
+ <input id="field_article" name="article"
type="text">
+ <xsl:attribute
name="value"><xsl:value-of select="config_data/article"/></xsl:attribute>
+ </input>
+ </dd>
<dt><label for="field_dim_1">Dim1 (pos 862 - 869)</label></dt>
<dd>
<input id="field_dim_1" name="dim_1"
type="text">
Modified: branches/Version-1_0-branch/booking/templates/base/building_form.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/building_form.xsl
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/templates/base/building_form.xsl
2010-12-06 14:05:15 UTC (rev 6647)
@@ -79,9 +79,30 @@
<div class="clr"/>
<dl class="form-col">
<xsl:if test="not(new_form)">
+ <dt><label
for="field_deactivate_application"><xsl:value-of select="php:function('lang',
'Deactivate application')"/></label></dt>
+ <dd>
+ <select
id="for_field_deactivate_application" name="deactivate_application">
+ <option value="1">
+ <xsl:if
test="building/deactivate_application=1">
+
<xsl:attribute name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Yes')"/>
+ </option>
+ <option value="0">
+ <xsl:if
test="building/deactivate_application=0">
+
<xsl:attribute name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'No')"/>
+ </option>
+ </select>
+ </dd>
+ </xsl:if>
+ </dl>
+ <dl class="form-col">
+ <xsl:if test="not(new_form)">
<dt><label
for="field_deactivate_calendar"><xsl:value-of select="php:function('lang',
'Deactivate calendar')"/></label></dt>
<dd>
- <select
id="deactivate_calendar" name="deactivate_calendar">
+ <select
id="for_deactivate_calendar" name="deactivate_calendar">
<option value="1">
<xsl:if
test="building/deactivate_calendar=1">
<xsl:attribute name="selected">checked</xsl:attribute>
@@ -100,17 +121,17 @@
</dl>
<dl class="form-col">
<xsl:if test="not(new_form)">
- <dt><label
for="field_deactivate_application"><xsl:value-of select="php:function('lang',
'Deactivate application')"/></label></dt>
+ <dt><label
for="field_deactivate_sendmessage"><xsl:value-of select="php:function('lang',
'Deactivate send message')"/></label></dt>
<dd>
- <select
id="field_deactivate_application" name="deactivate_application">
+ <select
id="for_deactivate_sendmessage" name="deactivate_sendmessage">
<option value="1">
- <xsl:if
test="building/deactivate_application=1">
+ <xsl:if
test="building/deactivate_sendmessage=1">
<xsl:attribute name="selected">checked</xsl:attribute>
</xsl:if>
<xsl:value-of
select="php:function('lang', 'Yes')"/>
</option>
<option value="0">
- <xsl:if
test="building/deactivate_application=0">
+ <xsl:if
test="building/deactivate_sendmessage=0">
<xsl:attribute name="selected">checked</xsl:attribute>
</xsl:if>
<xsl:value-of
select="php:function('lang', 'No')"/>
Modified: branches/Version-1_0-branch/booking/templates/base/event_edit.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/event_edit.xsl
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/booking/templates/base/event_edit.xsl
2010-12-06 14:05:15 UTC (rev 6647)
@@ -268,7 +268,7 @@
</dl>
<div class="form-buttons">
<input type="submit">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Send')"/></xsl:attribute>
</input>
<a class="cancel">
<xsl:attribute name="href"><xsl:value-of
select="event/cancel_link"/></xsl:attribute>
Modified:
branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
2010-12-06 14:05:15 UTC (rev 6647)
@@ -53,7 +53,7 @@
catch(Exception $e)
{
$errors[] = $e->getMessage();
- echo '<pre>';print_r($errors);exit;
+ echo
"<pre>\nErrors:";print_r($errors);echo "\nID:";print_r($id);echo
"\nJasperParam:";print_r($jasper_parameters);exit;
}
}
Modified:
branches/Version-1_0-branch/bookingfrontend/inc/class.uibuilding.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.uibuilding.inc.php
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.uibuilding.inc.php
2010-12-06 14:05:15 UTC (rev 6647)
@@ -15,11 +15,11 @@
$backend = phpgw::get_var('backend', 'GET');
$building =
$this->bo->get_schedule(phpgw::get_var('id', 'GET'),
'bookingfrontend.uibuilding');
if ($building['deactivate_application'] == 0) {
- $building['application_link'] = self::link(array(
- 'menuaction' =>
'bookingfrontend.uiapplication.add',
- 'building_id' => $building['id'],
- 'building_name' => $building['name'],
- ));
+ $building['application_link'] =
self::link(array(
+ 'menuaction' =>
'bookingfrontend.uiapplication.add',
+ 'building_id' => $building['id'],
+ 'building_name' => $building['name'],
+ ));
} else {
$building['application_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' =>
$building['id']));
}
Modified: branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2010-12-06 14:05:15 UTC (rev 6647)
@@ -21,7 +21,7 @@
$setup_info['bookingfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.00', '0.2.01','0.2.02')
+ 'versions' => Array('0.2.00', '0.2.01','0.2.02','0.2.03')
);
$setup_info['bookingfrontend']['depends'][] = array(
Modified:
branches/Version-1_0-branch/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/templates/base/building.xsl
2010-12-06 14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/bookingfrontend/templates/base/building.xsl
2010-12-06 14:05:15 UTC (rev 6647)
@@ -20,11 +20,6 @@
</div>
</xsl:if>
- <div>
- <button
onclick="window.location.href='{message_link}'"><xsl:value-of
select="php:function('lang', 'Send message')" /></button>
-- Meldig til saksbehandler for bygg
- </div>
-
<dl class="proplist-col main">
<xsl:if test="normalize-space(description)">
<dl class="proplist description">
@@ -35,6 +30,15 @@
<xsl:if test="normalize-space(homepage) or
normalize-space(email) or normalize-space(phone) or normalize-space(street)">
<h3><xsl:value-of
select="php:function('lang', 'Contact information')" /></h3>
+ <xsl:if test="deactivate_sendmessage=0">
+
+ <div>
+ <button
onclick="window.location.href='{message_link}'"><xsl:value-of
select="php:function('lang', 'Send message')" /></button>
+- Meldig til saksbehandler for bygg
+ </div>
+ </xsl:if>
+
+
<dl class="contactinfo">
<xsl:if test="homepage and
normalize-space(homepage)">
<dt><xsl:value-of
select="php:function('lang', 'Homepage')" /></dt>
Modified:
branches/Version-1_0-branch/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
---
branches/Version-1_0-branch/bookingfrontend/templates/base/building_schedule.xsl
2010-12-06 14:02:34 UTC (rev 6646)
+++
branches/Version-1_0-branch/bookingfrontend/templates/base/building_schedule.xsl
2010-12-06 14:05:15 UTC (rev 6647)
@@ -19,10 +19,10 @@
<xsl:call-template name="msgbox"/>
<xsl:if test="building/deactivate_application=0">
- <button
onclick="YAHOO.booking.newApplicationForm();"><xsl:value-of
select="php:function('lang', 'New booking application')" /></button>
- - Søk ledig tid
+ <button
onclick="YAHOO.booking.newApplicationForm();"><xsl:value-of
select="php:function('lang', 'New booking application')" /></button>
+ - Søk ledig tid
+ </xsl:if>
</xsl:if>
- </xsl:if>
<ul id="week-selector">
<li><a href="#" onclick="YAHOO.booking.prevWeek();
return false"><xsl:value-of select="php:function('lang', 'Previous
week')"/></a></li>
Modified: branches/Version-1_0-branch/login.php
===================================================================
--- branches/Version-1_0-branch/login.php 2010-12-06 14:02:34 UTC (rev
6646)
+++ branches/Version-1_0-branch/login.php 2010-12-06 14:05:15 UTC (rev
6647)
@@ -177,13 +177,18 @@
$login .= "@{$logindomain}";
}
+ $receipt = array();
if ( isset($GLOBALS['phpgw_info']['server']['usecookies'])
&& $GLOBALS['phpgw_info']['server']['usecookies'] )
{
if(isset($_COOKIE['domain']) && $_COOKIE['domain'] !=
$logindomain)
{
-
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", array('cd' =>22)); //
already within a session
- exit;
+
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
+
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
+//
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", array('cd' =>22)); //
already within a session
+// exit;
+
+ $receipt['message'][]=array('msg'=> lang('Info:
you have changed domain from "%1" to "%2"' ,$_COOKIE['domain'],$logindomain));
}
}
@@ -202,6 +207,11 @@
exit;
}
+ if($receipt)
+ {
+ phpgwapi_cache::session_set('phpgwapi',
'phpgw_messages', $receipt);
+ }
+
$forward = phpgw::get_var('phpgw_forward');
if($forward)
{
Modified: branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang 2010-12-06
14:02:34 UTC (rev 6646)
+++ branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang 2010-12-06
14:05:15 UTC (rev 6647)
@@ -128,3 +128,4 @@
use a valid username and password to gain access to %1 login no Angi et
gyldig brukernavn og passord for få tilgang til %1
version common no versjon
you have been successfully logged out login no Du har nå logget ut
+Info: you have changed domain from "%1" to "%2" login no
Informasjon: Du har endret domene fra "%1" til "%2"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6647] merge 6644:6646 from trunk,
Sigurd Nes <=