Changeset 72

Timestamp:

Jan 7, 2007 3:19:44 AM (6 years ago)

Author:

dkg

Message:

JPDD: added organizations (with descriptions), editable by admins.

Location:

trunk/jpdd

Files:

• class.dkg.row.php (modified) (5 diffs)
• class.jpdd.organization.php (added)
• class.jpdd.php (modified) (1 diff)
• class.jpdd.workshop.php (modified) (1 diff)
• sql/db.sql (modified) (2 diffs)

trunk/jpdd/class.dkg.row.php

@@ -29 +29 @@
 <fieldset><legend>New '.$sn.'</legend>
 '.$dkg_site->getFormTokenHiddenInput().'
-'.$this->getCreationFormInnards().'
+'.(method_exists($this, 'getCreationFormInnards') ? $this->getCreationFormInnards() : $this->getFormInnards()).'
 <div style="clear:both;"><input type="submit" value="Make new '.$sn.'"/></div>
 </form>
@@ -42 +42 @@
 <fieldset><legend>Edit '.$sn.' '.$this->getLinkedTitle().'</legend>
 '.$dkg_site->getFormTokenHiddenInput().'
-'.$this->getEditFormInnards().'
+'.(method_exists($this, 'getEditFormInnards') ? $this->getEditFormInnards() : $this->getFormInnards()).'
 <div style="clear:both;"><input type="submit" value="Save changes"/></div>
 </form>
@@ -104 +104 @@
         }
 
-        function getDescription($allowempty = false) {
+        function getDescription($allowempty = true) {
           global $dkg_site;
           if (!is_null($this->_description)) {
@@ -116 +116 @@
         }
 
-        function getCreationFormInnards() {
+        function getFormInnards() {
       return '';
     }
@@ -130 +130 @@
         $ret .= "\n".'<div><a href="'.$this->getEditPath().'">edit</a></div>'."\n";
       }
+      $dd = $this->getDescription();
+      if (!$dkg_site->isEmpty($dd)) {
+        $ret .= '<div>'.$dd.'</div>';
+      }
       $ret .= $this->getDetailInnards();
           return $ret;

trunk/jpdd/class.jpdd.php

@@ -17 +17 @@
                                               'filename' => 'class.jpdd.person.php',
                                               'table' => 'person'));
+      $this->addClassMapEntry('organization', array('classname' => 'JPDD_Organization', 
+                                                    'filename' => 'class.jpdd.organization.php',
+                                                    'table' => 'organization'));
     }
 

trunk/jpdd/class.jpdd.workshop.php

@@ -25 +25 @@
         }
 
-        function getCreationFormInnards() {
-          return $this->getFormInnards();
-        }
-        function getEditFormInnards() {
-          return $this->getFormInnards();
-        }
         function getFormInnards() {
           global $jpdd;

trunk/jpdd/sql/db.sql

@@ -69 +69 @@
 CREATE TABLE organization (
     id serial NOT NULL,
-    title character varying NOT NULL
+    title character varying NOT NULL,
+    description text
 );
 
@@ -331 +332 @@
 REVOKE ALL ON TABLE organization FROM dkg;
 GRANT ALL ON TABLE organization TO dkg;
-GRANT SELECT ON TABLE organization TO "www-data";
+GRANT INSERT,SELECT,UPDATE ON TABLE organization TO "www-data";
+
+
+--
+-- Name: organization_id_seq; Type: ACL; Schema: public; Owner: dkg
+--
+
+REVOKE ALL ON TABLE organization_id_seq FROM PUBLIC;
+REVOKE ALL ON TABLE organization_id_seq FROM dkg;
+GRANT ALL ON TABLE organization_id_seq TO dkg;
+GRANT SELECT,UPDATE ON TABLE organization_id_seq TO "www-data";