projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0bb0837
)
Switch actor's address field to an URL, and make it clickable on the actor details...
author
Roland Mas
<lolando@debian.org>
Wed, 24 Feb 2010 12:52:40 +0000
(12:52 +0000)
committer
Roland Mas
<lolando@debian.org>
Wed, 24 Feb 2010 12:52:40 +0000
(12:52 +0000)
gforge/plugins/contribtracker/common/ContribTrackerPlugin.class.php
patch
|
blob
|
history
gforge/plugins/contribtracker/lib/contribtracker-init.sql
patch
|
blob
|
history
gforge/plugins/contribtracker/www/global_admin.php
patch
|
blob
|
history
gforge/plugins/contribtracker/www/index.php
patch
|
blob
|
history
diff --git
a/gforge/plugins/contribtracker/common/ContribTrackerPlugin.class.php
b/gforge/plugins/contribtracker/common/ContribTrackerPlugin.class.php
index ea9a4b362d2b121c1ea0beba9d0337ec02f8b8a1..25d26455de39010e09a43a7cb089ed011c65a611 100644
(file)
--- a/
gforge/plugins/contribtracker/common/ContribTrackerPlugin.class.php
+++ b/
gforge/plugins/contribtracker/common/ContribTrackerPlugin.class.php
@@
-505,16
+505,16
@@
class ContribTrackerActor extends Error {
return true ;
}
return true ;
}
- function create ($name, $
address
, $email, $description, $logo, $structure) {
+ function create ($name, $
url
, $email, $description, $logo, $structure) {
if ($this->getId ()) {
$this->setError(_('Object already exists')) ;
return false ;
}
db_begin () ;
if ($this->getId ()) {
$this->setError(_('Object already exists')) ;
return false ;
}
db_begin () ;
- $res = db_query_params ('INSERT INTO plugin_contribtracker_actor (name,
address
,email,description,logo,struct_id) VALUES ($1,$2,$3,$4,$5,$6)',
+ $res = db_query_params ('INSERT INTO plugin_contribtracker_actor (name,
url
,email,description,logo,struct_id) VALUES ($1,$2,$3,$4,$5,$6)',
array ($name,
array ($name,
- $
address
,
+ $
url
,
$email,
$description,
base64_encode ($logo),
$email,
$description,
base64_encode ($logo),
@@
-538,7
+538,7
@@
class ContribTrackerActor extends Error {
return $this->fetchData ($id) ;
}
return $this->fetchData ($id) ;
}
- function update ($name, $
address
, $email, $description, $logo, $structure) {
+ function update ($name, $
url
, $email, $description, $logo, $structure) {
if (! $this->getId ()) {
$this->setError(_('Object does not exist')) ;
return false ;
if (! $this->getId ()) {
$this->setError(_('Object does not exist')) ;
return false ;
@@
-547,9
+547,9
@@
class ContribTrackerActor extends Error {
$id = $this->getId () ;
db_begin () ;
$id = $this->getId () ;
db_begin () ;
- $res = db_query_params ('UPDATE plugin_contribtracker_actor SET (name,
address
,email,description,logo,struct_id) = ($1,$2,$3,$4,$5,$6) WHERE actor_id = $7',
+ $res = db_query_params ('UPDATE plugin_contribtracker_actor SET (name,
url
,email,description,logo,struct_id) = ($1,$2,$3,$4,$5,$6) WHERE actor_id = $7',
array ($name,
array ($name,
- $
address
,
+ $
url
,
$email,
$description,
base64_encode ($logo),
$email,
$description,
base64_encode ($logo),
@@
-594,7
+594,7
@@
class ContribTrackerActor extends Error {
}
}
function getName () { return $this->data_array['name'] ; }
}
}
function getName () { return $this->data_array['name'] ; }
- function get
Address () { return $this->data_array['address
'] ; }
+ function get
Url () { return $this->data_array['url
'] ; }
function getEmail () { return $this->data_array['email'] ; }
function getDescription () { return $this->data_array['description'] ; }
function getLegalStructure () {
function getEmail () { return $this->data_array['email'] ; }
function getDescription () { return $this->data_array['description'] ; }
function getLegalStructure () {
diff --git
a/gforge/plugins/contribtracker/lib/contribtracker-init.sql
b/gforge/plugins/contribtracker/lib/contribtracker-init.sql
index 2f8e5ab64042cdd38d8663ea16d23b0ce164e048..ec4e98d827cd321b8c6d6acff822bb6e59447b57 100644
(file)
--- a/
gforge/plugins/contribtracker/lib/contribtracker-init.sql
+++ b/
gforge/plugins/contribtracker/lib/contribtracker-init.sql
@@
-15,7
+15,7
@@
CREATE SEQUENCE plugin_contribtracker_actor_pk_seq ;
CREATE TABLE plugin_contribtracker_actor (
actor_id integer DEFAULT nextval('plugin_contribtracker_actor_pk_seq') PRIMARY KEY,
name text UNIQUE NOT NULL,
CREATE TABLE plugin_contribtracker_actor (
actor_id integer DEFAULT nextval('plugin_contribtracker_actor_pk_seq') PRIMARY KEY,
name text UNIQUE NOT NULL,
-
address
text DEFAULT '' NOT NULL,
+
url
text DEFAULT '' NOT NULL,
email text DEFAULT '' NOT NULL,
description text DEFAULT '' NOT NULL,
logo text DEFAULT '' NOT NULL,
email text DEFAULT '' NOT NULL,
description text DEFAULT '' NOT NULL,
logo text DEFAULT '' NOT NULL,
diff --git
a/gforge/plugins/contribtracker/www/global_admin.php
b/gforge/plugins/contribtracker/www/global_admin.php
index 4ce17dc7794b49fdb13e2bac7461e94f6742a72d..1ad0d86e94a37f538a6213c23491c1a143037258 100644
(file)
--- a/
gforge/plugins/contribtracker/www/global_admin.php
+++ b/
gforge/plugins/contribtracker/www/global_admin.php
@@
-121,7
+121,7
@@
case 'add_actor':
break ;
case 'post_add_actor':
$name = getStringFromRequest ('actor_name') ;
break ;
case 'post_add_actor':
$name = getStringFromRequest ('actor_name') ;
- $
address = getStringFromRequest ('actor_address
') ;
+ $
url = getStringFromRequest ('actor_url
') ;
$email = getStringFromRequest ('actor_email') ;
$desc = getStringFromRequest ('actor_desc') ;
$logoarr = getUploadedFile ('actor_logo') ;
$email = getStringFromRequest ('actor_email') ;
$desc = getStringFromRequest ('actor_desc') ;
$logoarr = getUploadedFile ('actor_logo') ;
@@
-138,7
+138,7
@@
case 'post_edit_actor':
$actor_id = getIntFromRequest ('actor_id') ;
check_actor_id ($actor_id) ;
$name = getStringFromRequest ('actor_name') ;
$actor_id = getIntFromRequest ('actor_id') ;
check_actor_id ($actor_id) ;
$name = getStringFromRequest ('actor_name') ;
- $
address = getStringFromRequest ('actor_address
') ;
+ $
url = getStringFromRequest ('actor_url
') ;
$email = getStringFromRequest ('actor_email') ;
$desc = getStringFromRequest ('actor_desc') ;
$logoarr = getUploadedFile ('actor_logo') ;
$email = getStringFromRequest ('actor_email') ;
$desc = getStringFromRequest ('actor_desc') ;
$logoarr = getUploadedFile ('actor_logo') ;
@@
-193,7
+193,7
@@
case 'post_edit_structure':
case 'post_add_actor':
$actor = new ContribTrackerActor () ;
$structure = new ContribTrackerLegalStructure ($structure_id) ;
case 'post_add_actor':
$actor = new ContribTrackerActor () ;
$structure = new ContribTrackerLegalStructure ($structure_id) ;
- if (!$actor->create ($name, $
address
, $email, $desc, $logo, $structure)) {
+ if (!$actor->create ($name, $
url
, $email, $desc, $logo, $structure)) {
exit_error ($actor->getErrorMessage()) ;
}
$actor_id = $actor->getId() ;
exit_error ($actor->getErrorMessage()) ;
}
$actor_id = $actor->getId() ;
@@
-207,7
+207,7
@@
case 'del_actor':
case 'post_edit_actor':
$actor = new ContribTrackerActor ($actor_id) ;
$structure = new ContribTrackerLegalStructure ($structure_id) ;
case 'post_edit_actor':
$actor = new ContribTrackerActor ($actor_id) ;
$structure = new ContribTrackerLegalStructure ($structure_id) ;
- $actor->update ($name, $
address
, $email, $desc, $logo, $structure) ;
+ $actor->update ($name, $
url
, $email, $desc, $logo, $structure) ;
$action = 'display' ;
break ;
}
$action = 'display' ;
break ;
}
@@
-222,7
+222,7
@@
case 'display':
print '<table><thead><tr>' ;
print '<td><strong>'._('Logo').'</strong></td>' ;
print '<td><strong>'._('Short name').'</strong></td>' ;
print '<table><thead><tr>' ;
print '<td><strong>'._('Logo').'</strong></td>' ;
print '<td><strong>'._('Short name').'</strong></td>' ;
- print '<td><strong>'._('
Postal address
').'</strong></td>' ;
+ print '<td><strong>'._('
URL
').'</strong></td>' ;
print '<td><strong>'._('Email').'</strong></td>' ;
print '<td><strong>'._('Description').'</strong></td>' ;
print '<td><strong>'._('Legal structure').'</strong></td>' ;
print '<td><strong>'._('Email').'</strong></td>' ;
print '<td><strong>'._('Description').'</strong></td>' ;
print '<td><strong>'._('Legal structure').'</strong></td>' ;
@@
-236,7
+236,7
@@
case 'display':
}
print '</td>' ;
print '<td>'.htmlspecialchars($a->getName()).'</td>' ;
}
print '</td>' ;
print '<td>'.htmlspecialchars($a->getName()).'</td>' ;
- print '<td>'.htmlspecialchars($a->get
Address
()).'</td>' ;
+ print '<td>'.htmlspecialchars($a->get
Url
()).'</td>' ;
print '<td>'.htmlspecialchars($a->getEmail()).'</td>' ;
print '<td>'.htmlspecialchars($a->getDescription()).'</td>' ;
print '<td>'.htmlspecialchars($a->getLegalStructure()->getName()).'</td>' ;
print '<td>'.htmlspecialchars($a->getEmail()).'</td>' ;
print '<td>'.htmlspecialchars($a->getDescription()).'</td>' ;
print '<td>'.htmlspecialchars($a->getLegalStructure()->getName()).'</td>' ;
@@
-413,7
+413,7
@@
case 'add_actor':
<form action="<?php echo util_make_url ('/plugins/'.$plugin->name.'/global_admin.php') ?>" method="post" enctype="multipart/form-data">
<input type="hidden" name="action" value="post_add_actor" />
<?php echo _('Actor name:') ?> <input type="text" name="actor_name" size="20" /><br />
<form action="<?php echo util_make_url ('/plugins/'.$plugin->name.'/global_admin.php') ?>" method="post" enctype="multipart/form-data">
<input type="hidden" name="action" value="post_add_actor" />
<?php echo _('Actor name:') ?> <input type="text" name="actor_name" size="20" /><br />
- <?php echo _('Actor
address:') ?> <input type="text" name="actor_address
" size="20" /><br />
+ <?php echo _('Actor
URL:') ?> <input type="text" name="actor_url
" size="20" /><br />
<?php echo _('Actor email:') ?> <input type="text" name="actor_email" size="20" /><br />
<?php echo _('Actor description:') ?><br />
<textarea name="actor_desc" rows="20" cols="80"></textarea><br />
<?php echo _('Actor email:') ?> <input type="text" name="actor_email" size="20" /><br />
<?php echo _('Actor description:') ?><br />
<textarea name="actor_desc" rows="20" cols="80"></textarea><br />
@@
-443,7
+443,7
@@
case 'edit_actor':
<input type="hidden" name="action" value="post_edit_actor" />
<input type="hidden" name="actor_id" value="<?php echo $actor->getId() ?>" />
<?php echo _('Actor name:') ?> <input type="text" name="actor_name" size="20" value="<?php echo htmlspecialchars ($actor->getName()) ?>" /><br />
<input type="hidden" name="action" value="post_edit_actor" />
<input type="hidden" name="actor_id" value="<?php echo $actor->getId() ?>" />
<?php echo _('Actor name:') ?> <input type="text" name="actor_name" size="20" value="<?php echo htmlspecialchars ($actor->getName()) ?>" /><br />
- <?php echo _('Actor
address:') ?> <input type="text" name="actor_address" size="20" value="<?php echo htmlspecialchars ($actor->getAddress
()) ?>" /><br />
+ <?php echo _('Actor
URL:') ?> <input type="text" name="actor_url" size="20" value="<?php echo htmlspecialchars ($actor->getUrl
()) ?>" /><br />
<?php echo _('Actor email:') ?> <input type="text" name="actor_email" size="20" value="<?php echo htmlspecialchars ($actor->getEmail()) ?>" /><br />
<?php echo _('Actor description:') ?><br />
<textarea name="actor_desc" rows="20" cols="80"><?php echo htmlspecialchars ($actor->getDescription()) ?></textarea><br />
<?php echo _('Actor email:') ?> <input type="text" name="actor_email" size="20" value="<?php echo htmlspecialchars ($actor->getEmail()) ?>" /><br />
<?php echo _('Actor description:') ?><br />
<textarea name="actor_desc" rows="20" cols="80"><?php echo htmlspecialchars ($actor->getDescription()) ?></textarea><br />
diff --git
a/gforge/plugins/contribtracker/www/index.php
b/gforge/plugins/contribtracker/www/index.php
index f2b0f24a9da21c291aae8a9f7a66b096ddc3cf33..e2a2801d48b4a571518c70b33326e100bb5af1f1 100644
(file)
--- a/
gforge/plugins/contribtracker/www/index.php
+++ b/
gforge/plugins/contribtracker/www/index.php
@@
-125,7
+125,7
@@
if ($group_id) {
htmlspecialchars($actor->getName())).'</h1>' ;
print '<ul>' ;
print '<li><strong>'._('Name:').'</strong> '.htmlspecialchars($actor->getName()).'</li>' ;
htmlspecialchars($actor->getName())).'</h1>' ;
print '<ul>' ;
print '<li><strong>'._('Name:').'</strong> '.htmlspecialchars($actor->getName()).'</li>' ;
- print '<li><strong>'._('
Address:').'</strong> '.htmlspecialchars($actor->getAddress()).'
</li>' ;
+ print '<li><strong>'._('
URL:').'</strong> <a href="'.htmlspecialchars($actor->getUrl()).'">'.htmlspecialchars($actor->getUrl()).'</a>
</li>' ;
print '<li><strong>'._('Email:').'</strong> '.htmlspecialchars($actor->getEmail()).'</li>' ;
print '<li><strong>'._('Legal structure:').'</strong> '.htmlspecialchars($actor->getLegalStructure()->getName()).'</li>' ;
print '<li><strong>'._('Description:').'</strong> '.htmlspecialchars($actor->getDescription()).'</li>' ;
print '<li><strong>'._('Email:').'</strong> '.htmlspecialchars($actor->getEmail()).'</li>' ;
print '<li><strong>'._('Legal structure:').'</strong> '.htmlspecialchars($actor->getLegalStructure()->getName()).'</li>' ;
print '<li><strong>'._('Description:').'</strong> '.htmlspecialchars($actor->getDescription()).'</li>' ;