[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16269] formatting
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16269] formatting |
|
Date: |
Tue, 7 Feb 2017 10:34:39 -0500 (EST) |
Revision: 16269
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16269
Author: sigurdne
Date: 2017-02-07 10:34:39 -0500 (Tue, 07 Feb 2017)
Log Message:
-----------
formatting
Modified Paths:
--------------
trunk/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
trunk/helpdesk/inc/class.uitts.inc.php
Modified:
trunk/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
===================================================================
--- trunk/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2017-02-07 14:18:30 UTC (rev 16268)
+++ trunk/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2017-02-07 15:34:39 UTC (rev 16269)
@@ -130,89 +130,6 @@
}
$_SESSION['orgs'] = $orgs;
$_SESSION['org_id'] = $_org_id; // one of them..
-return;
- $stage = phpgw::get_var('stage');
- $org_id = phpgw::get_var('org_id');
-
- if ($stage == 2 && $fodsels_nr && in_array($org_id,
$orgs_validate))
- {
- try
- {
- return
createObject('booking.sfValidatorNorwegianOrganizationNumber')->clean($org_id);
- }
- catch (sfValidatorError $e)
- {
- if ($this->debug)
- {
- echo $e->getMessage();
- die();
- }
- return null;
- }
- }
-
- foreach ($orgs as $org)
- {
- $selected = '';
- if ($org_id == $org['id'])
- {
- $selected = 'selected = "selected"';
- }
-
- $org_option .= <<<HTML
- <option
value='{$org['id']}'{$selected}>{$org['name']}</option>
-
-HTML;
- }
-
- if ($orgs)
- {
- $action =
$GLOBALS['phpgw']->link('/eventplannerfrontend/login.php', array('stage' => 2));
- $message = 'Velg organisasjon';
-
- $org_select = <<<HTML
- <p>
- <label
for="org_id">Velg Organisasjon:</label>
- <select
name="org_id" id="org_id">
-
{$org_option}
- </select>
- </p>
-HTML;
- }
- else
- {
- $action =
$GLOBALS['phpgw']->link('/eventplannerfrontend/index.php');
- $message = 'Ikke representant for noen
organisasjon';
- $org_select = '';
- }
-
- $html = <<<HTML
- <!DOCTYPE html>
- <html>
- <head>
- <title>Velg organisasjon</title>
- <meta http-equiv="Content-Type"
content="text/html; charset=utf-8">
- </head>
- <body>
- <h2>{$message}</h2>
- <form action="{$action}" method="post">
- <fieldset>
- <legend>
- Organisasjon
- </legend>
- $org_select
- <p>
- <input
type="submit" name="submit" value="Fortsett" />
- </p>
- </fieldset>
- </form>
- </body>
- </html>
-HTML;
-
- echo $html;
-
- $GLOBALS['phpgw']->common->phpgw_exit();
}
}
\ No newline at end of file
Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php 2017-02-07 14:18:30 UTC (rev
16268)
+++ trunk/helpdesk/inc/class.uitts.inc.php 2017-02-07 15:34:39 UTC (rev
16269)
@@ -713,13 +713,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'helpdesk.uitts.columns'},
{closeAction:'reload'})"
- ),
array
(
'type' =>
'date-picker',
@@ -745,6 +738,7 @@
'download' =>
self::link(array('menuaction' => 'helpdesk.uitts.download',
'export' => true, 'allrows' =>
true)),
'allrows' => true,
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'helpdesk.uitts.columns'},
{closeAction:'reload'})"),
'new_item' =>
self::link(array('menuaction' => 'helpdesk.uitts.add')),
'editor_action' =>
self::link(array('menuaction' => 'helpdesk.uitts.edit_survey_title')),
'field' => $this->_get_fields(),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16269] formatting,
sigurdne <=