Merge pull request #254 from rmdstudio/master

bug fixes for version 4.1.4

CHANGELOG.md

@@ -1,5 +1,13 @@
 To view the detailed commits log go to https://github.com/anahitasocial/anahita/commits/master
 
+Anahita 4.1.4 Birth Release
+=============================
+* fixed validation of whether an edge had the same node at both ends
+* migration script to remove all the edges in the database which had the same node at both ends
+* UI refinements
+* migration script to change todos_todos table to InnoDB
+* added an editable placeholder for the photos which had no title or description 
+
 Anahita 4.1.3 Birth Release
 =============================
 * major updates to the Subscriptions app. We are now using it ourselves.

README.md

@@ -2,7 +2,7 @@
 
 # Anahita
 
-*Version:* 4.1.3 Birth Release
+*Version:* 4.1.4 Birth Release
 
 Anahita is a social networking framework and platform for building knowledge sharing apps and services. Use Anahita to launch:
 

packages/Connect/src/site/components/com_connect/views/setting/html/default.php

@@ -32,7 +32,8 @@
             $session = null;
         }
         ?>
-		<div>
+
+		<div class="entity-actions">
     		<form action="<?= @route( array( 'option' => 'com_connect', 'view' => 'setting', 'oid' => $actor->uniqueAlias, 'server' => $api->getName())) ?>" method="post">
     			<?php if ( !$session ) : ?>	
     			<input type="hidden" name="get" value="accesstoken" />

packages/Photos/src/site/components/com_photos/controllers/toolbars/actorbar.php

@@ -41,7 +41,6 @@ public function onBeforeControllerGet(KEvent $event)
 		$viewer = $this->getController()->viewer;
 		$actor = pick($this->getController()->actor, $viewer);
 		$layout = pick($this->getController()->getRequest()->layout, 'default');
-
 		$name = $this->getController()->getIdentifier()->name;
 
 		//create title

packages/Photos/src/site/components/com_photos/domains/entities/component.php

@@ -67,9 +67,9 @@ protected function _setGadgets($actor, $gadgets, $mode)
 		{
 			$gadgets->insert('photos', array(
 					'title' 	    => JText::_('COM-PHOTOS-GADGET-DASHBOARD'),
-					'url'   	    => 'option=com_photos&view=photos&filter=leaders&layout=gadget&oid='.$actor->uniqueAlias,
+					'url'   	    => 'option=com_photos&view=photos&layout=gadget&filter=leaders',
 					'action'        => JText::_('LIB-AN-GADGET-VIEW-ALL'),
-					'action_url' 	=> 'option=com_photos&view=photos&filter=leaders&oid='.$actor->uniqueAlias,
+					'action_url' 	=> 'option=com_photos&view=photos&filter=leaders',
 			));
 		}
 	}

packages/Photos/src/site/components/com_photos/views/photo/html/list.php

@@ -29,7 +29,11 @@
 
 	<div class="entity-description-wrapper">
 		<h3 class="entity-title">
-			<?= @escape($photo->title) ?>
+		    <?php if( $photo->title ): ?>
+			<?= @escape( $photo->title ) ?>
+			<?php else : ?>
+			<span class="muted"><?= @text('LIB-AN-EDITABLE-PLACEHOLDER') ?></span>    
+			<?php endif; ?>    
 		</h3>
 
 		<div class="entity-description">

packages/Photos/src/site/components/com_photos/views/photo/html/masonry.php

@@ -30,9 +30,13 @@
 
 	<div class="entity-description-wrapper">
     	<h4 class="entity-title">
-    		<a title="<?= @escape($photo->title) ?>" href="<?= @route($photo->getURL()) ?>">
-    		<?= @escape($photo->title) ?>
-    		</a>
+    		<?php if( $photo->title ): ?>
+            <a title="<?= @escape($photo->title) ?>" href="<?= @route($photo->getURL()) ?>">
+            <?= @escape($photo->title) ?>
+            </a>
+            <?php else : ?>
+            <span class="muted"><?= @text('LIB-AN-EDITABLE-PLACEHOLDER') ?></span>    
+            <?php endif; ?>  
     	</h4>
 
     	<div class="entity-description">

packages/Photos/src/site/components/com_photos/views/photo/html/photo.php

@@ -15,7 +15,11 @@
 
 	<div class="entity-description-wrapper">
 		<h3 class="entity-title">
-			<?= @escape($photo->title) ?>
+			<?php if( $photo->title ): ?>
+            <?= @escape( $photo->title ) ?>
+            <?php else : ?>
+            <span class="muted"><?= @text('LIB-AN-EDITABLE-PLACEHOLDER') ?></span>    
+            <?php endif; ?> 
 		</h3>
 
 		<div class="entity-description">

packages/Todos/src/administrator/components/com_todos/schemas/migrations/4.php

@@ -0,0 +1,33 @@
+<?php
+
+/** 
+ * LICENSE: ##LICENSE##
+ * 
+ * @package    Com_Todos
+ * @subpackage Schema_Migration
+ */
+
+/**
+ * Schema Migration
+ *
+ * @package    Com_Todos
+ * @subpackage Schema_Migration
+ */
+class ComTodosSchemaMigration4 extends ComMigratorMigrationVersion
+{
+   /**
+    * Called when migrating up
+    */
+    public function up()
+    {
+        dbexec('ALTER TABLE #__todos_todos ENGINE=InnoDB');
+    }
+
+   /**
+    * Called when rolling back a migration
+    */        
+    public function down()
+    {
+        //add your migration here        
+    }
+}

packages/Todos/src/administrator/components/com_todos/schemas/schema.sql

@@ -7,6 +7,6 @@ CREATE TABLE `#__todos_todos` (
   `open_status_change_by` bigint(11) DEFAULT NULL,
   PRIMARY KEY (`todos_todo_id`),
   UNIQUE KEY `node_id` (`node_id`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 INSERT INTO #__migrator_versions (`version`,`component`) VALUES(1, 'todos') ON DUPLICATE KEY UPDATE `version` = 1;

packages/Todos/src/site/components/com_todos/domains/entities/todo.php

@@ -30,23 +30,11 @@ class ComTodosDomainEntityTodo extends ComMediumDomainEntityMedium
 	/*
 	 * Priorities values
 	 */
-	const PRIORITY_HIGHEST	= 2;
-	const PRIORITY_HIGH		= 1;
-	const PRIORITY_NORMAL	= 0; 
-	const PRIORITY_LOW		= -1;
-	const PRIORITY_LOWEST	= -2;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param KConfig $config An optional KConfig object with configuration options.
-	 *
-	 * @return void
-	 */
-	public function __construct(KConfig $config)
-	{
-	    parent::__construct($config);
-	}
+	const PRIORITY_HIGHEST =  2;
+	const PRIORITY_HIGH	   =  1;
+	const PRIORITY_NORMAL  =  0; 
+	const PRIORITY_LOW     = -1;
+	const PRIORITY_LOWEST  = -2;
 
 	/**
 	 * Initializes the default configuration for the object
@@ -57,17 +45,17 @@ public function __construct(KConfig $config)
 	 *
 	 * @return void
 	 */
-	protected function _initialize(KConfig $config)
+	protected function _initialize( KConfig $config )
 	{				
 		$config->append(array(
-			'resources'		=> array('todos_todos'),
+			'resources'		=> array( 'todos_todos' ),
 			'attributes' => array(
-				'name' => array('required'=>true),
-				'openStatusChangeTime' => array('column'=>'open_status_change_time','default'=>'date', 'type'=>'date', 'write'=>'private'),
-				'priority' => array('column'=>'ordering',  'default'=>self::PRIORITY_NORMAL, 'type'=>'integer')
+				'name' => array( 'required' => true ),
+				'openStatusChangeTime' => array( 'column'=>'open_status_change_time','default'=>'date', 'type'=>'date', 'write'=>'private'),
+				'priority' => array( 'column'=>'ordering',  'default'=>self::PRIORITY_NORMAL, 'type'=>'integer')
 				),
 			'relationships' => array(
-				'lastChanger' => array('parent'=>'com:people.domain.entity.person', 'child_column'=>'open_status_change_by'),
+				'lastChanger' => array( 'parent'=>'com:people.domain.entity.person', 'child_column'=>'open_status_change_by'),
 				),
 			'behaviors' => array(
 				'enableable'
@@ -77,29 +65,29 @@ protected function _initialize(KConfig $config)
 			)
 		));
 
-		parent::_initialize($config);		
+		parent::_initialize( $config );		
 	}
 
 	/**
 	 * Opens the todo item
 	 * 
 	 * @return null
 	 */
-	public function open($changer)
+	public function open( $changer )
 	{
 		$this->open = true;
-		$this->setLastChanger($changer);		
+		$this->setLastChanger( $changer );		
 	}
 
 	/**
 	 * Closes the todo item
 	 * 
 	 * @return null
 	 */
-	public function close($changer)
+	public function close( $changer )
 	{
 		$this->open = false;
-		$this->setLastChanger($changer);		
+		$this->setLastChanger( $changer );		
 	}
 
 	/**
@@ -111,7 +99,7 @@ public function close($changer)
 	 */
 	public function setLastChanger($changer)
 	{
-		$this->set('lastChanger', $changer);
-		$this->set('openStatusChangeTime', AnDomainAttribute::getInstance('date'));
+		$this->set( 'lastChanger', $changer );
+		$this->set( 'openStatusChangeTime', AnDomainAttribute::getInstance('date') );
 	}
 }

src/administrator/components/com_anahita/schemas/migrations/12.php

@@ -0,0 +1,33 @@
+<?php
+
+/** 
+ * LICENSE: ##LICENSE##
+ * 
+ * @package    Com_Anahita
+ * @subpackage Schema_Migration
+ */
+
+/**
+ * Schema Migration
+ *
+ * @package    Com_Anahita
+ * @subpackage Schema_Migration
+ */
+class ComAnahitaSchemaMigration12 extends ComMigratorMigrationVersion
+{
+   /**
+    * Called when migrating up
+    */
+    public function up()
+    {
+        dbexec("DELETE FROM #__anahita_edges WHERE node_a_id = node_b_id");
+    }
+
+   /**
+    * Called when rolling back a migration
+    */        
+    public function down()
+    {
+        //add your migration here        
+    }
+}

src/libraries/anahita/anahita.php

@@ -36,7 +36,7 @@ class Anahita
      * 
      * @var string
      */
-    static protected $_version = '4.1.3';
+    static protected $_version = '4.1.4';
 
     /**
      * Path to Anahita libraries

src/libraries/default/base/domain/behavior/parentable.php

@@ -45,12 +45,14 @@ protected function _initialize(KConfig $config)
 	    $relationship['polymorphic'] = $config->polymorphic;
 
 		//if parent is set, then set the base parent
-		if(isset($config['parent'])) 
+		if( isset( $config['parent'] ) ) 
 		{
-		    if(strpos($config['parent'], '.') === false)
+		    if( strpos( $config['parent'], '.' ) === false )
 		    {
 		        $identifier = clone $config->service_identifier;
+
 		        $identifier->path = array('domain','entity');
+
 		        $identifier->name = $config['parent'];		        
 		    } 
 		    else 
@@ -59,6 +61,7 @@ protected function _initialize(KConfig $config)
 		    }			    
 
 			$relationship['parent'] = $identifier;
+
 			unset($config['parent']);
 
 			$config->append(array(
@@ -72,6 +75,6 @@ protected function _initialize(KConfig $config)
 			)
 		));
 
-		parent::_initialize($config);
+		parent::_initialize( $config );
 	}	
 }

src/libraries/default/people/viewer.php

@@ -51,7 +51,8 @@ public static function getInstance(KConfigInterface $config, KServiceInterface $
             {   
                 $viewer = $container->get('repos://site/people.person')->find(array('userId'=>$id));                                
 
-                if ( !$viewer ) {
+                if ( !$viewer ) 
+                {
                     $viewer	 = $container->get('com://site/people.helper.person')->createFromUser( JFactory::getUser() );
                     $viewer->save();
                 }
@@ -62,6 +63,4 @@ public static function getInstance(KConfigInterface $config, KServiceInterface $
 
         return $container->get($config->service_identifier);
     }
-}
-
-?>
+}

src/site/components/com_base/domains/entities/edge.php

@@ -72,10 +72,12 @@ protected function _initialize(KConfig $config)
 	//protected function _beforeEntityInsert(KCommandContext $context)
 	protected function _onEntityValidate(KCommandContext $context)
 	{
-		//@TODO temporary move it to a repository validators ??
+
 		if( $this->nodeA->id == $this->nodeB->id )
         {
 			return false;
         }
+
+        return true;
 	}
 }

src/site/language/en-GB/en-GB.lib_anahita.ini

@@ -257,4 +257,7 @@ LIB-AN-SEARCH-PLACEHOLDER=Search ...
 LIB-AN-SEARCH-PLACEHOLDER-OWNER=Search %s...
 
 /* Remote */
-LIB-AN-REMOTE-LOADING=Loading ...
+LIB-AN-REMOTE-LOADING=Loading ...
+
+/* Editable */
+LIB-AN-EDITABLE-PLACEHOLDER=Click to edit

src/site/templates/base/css/core/entity.less

@@ -65,7 +65,13 @@ h4.entity-name,
 {
   form
   {
-    padding: 0 10px;
+     padding: 10px;
+     margin: 0;
+
+     .form-actions
+     {
+        margin: 0;
+     }
   }
 }
 

src/site/templates/base/css/style.less

@@ -7,6 +7,7 @@
  */
 //include bootstrap
 
+
 // CSS Reset
 @import "bootstrap/reset.less";
 

vendor/joomla/installation/sql/schema.sql

@@ -43,6 +43,7 @@ CREATE TABLE `#__anahita_nodes` (
   `last_comment_on` datetime DEFAULT NULL,
   `ordering` int(11) DEFAULT NULL,
   `enabled` tinyint(1) DEFAULT NULL,
+  `pinned` tinyint(1) NOT NULL DEFAULT 0,
   `is_default` tinyint(1) DEFAULT NULL,
   `meta` text,
   `hits` int(11) unsigned DEFAULT NULL,