[Openutils-svn] SF.net SVN: openutils:[3339] trunk/openutils-mgnlmedia/src/main

[<die...@us...>]

Revision: 3339
          http://openutils.svn.sourceforge.net/openutils/?rev=3339&view=rev
Author:   diego_schivo
Date:     2011-02-16 17:17:21 +0000 (Wed, 16 Feb 2011)

Log Message:
-----------
MEDIA-218 search-based property

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java	2011-02-09 21:10:35 UTC (rev 3338)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java	2011-02-16 17:17:21 UTC (rev 3339)
@@ -38,7 +38,7 @@
 
     private List<PlaylistEntryBean> entries;
 
-    private boolean readOnly;
+    private boolean searchBased;
 
     /**
      * Returns the uuid.
@@ -130,23 +130,22 @@
         this.entries = entries;
     }
 
-    
     /**
-     * Returns the readOnly.
-     * @return the readOnly
+     * Returns the searchBased.
+     * @return the searchBased
      */
-    public boolean isReadOnly()
+    public boolean isSearchBased()
     {
-        return readOnly;
+        return searchBased;
     }
 
-    
     /**
-     * Sets the readOnly.
-     * @param readOnly the readOnly to set
+     * Sets the searchBased.
+     * @param searchBased the searchBased to set
      */
-    public void setReadOnly(boolean readOnly)
+    public void setSearchBased(boolean searchBased)
     {
-        this.readOnly = readOnly;
+        this.searchBased = searchBased;
     }
+
 }

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2011-02-09 21:10:35 UTC (rev 3338)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2011-02-16 17:17:21 UTC (rev 3339)
@@ -239,7 +239,7 @@
 
                 try
                 {
-                    playlist.setReadOnly(node.hasContent("search"));
+                    playlist.setSearchBased(node.hasContent("search"));
                 }
                 catch (RepositoryException e)
                 {

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2011-02-09 21:10:35 UTC (rev 3338)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2011-02-16 17:17:21 UTC (rev 3339)
@@ -48,11 +48,11 @@
   ]);
 
   var tbar = [
+[#if (!this.playlist.searchBased)]
     {
       text: playlist.msgs.addEntry,
       icon: contextPath + '/.resources/media/icons/ico16-add.png',
       iconCls: 'button-add',
-      disabled: playlist.readOnly,
       handler: function(){
         var mgnlWin = parent.parent;
         mgnlWin.setNewMedia = function(nodeid, uuid, file, thumb){
@@ -77,7 +77,6 @@
       text: playlist.msgs.addEntries,
       icon: contextPath + '/.resources/media/icons/ico16-addmany.png',
       iconCls: 'button-addmany',
-      disabled: playlist.readOnly,
       handler: function(){
         var mgnlWin = parent.parent;
         parent.openWindow(".magnolia/pages/mediaFolderSelection.html?parentFrame=playlistView&action=addEntries&mgnlCK=" + mgnlWin.mgnlGetCacheKiller());
@@ -99,6 +98,7 @@
         });
       }
     },
+[/#if]
     {
       id: 'editMediaBtn',
       text: playlist.msgs.editMedia,
@@ -249,8 +249,10 @@
         autoSizeColumns: true,
         enableColLock: false,
         tbar: tbar,
-        stripeRows: true,
-        plugins: !playlist.readOnly ? [dd] : []
+        stripeRows: true
+[#if (!this.playlist.searchBased)]
+        , plugins: [dd]
+[/#if]
       }
     },{
       columnWidth: 0.4,
@@ -289,7 +291,7 @@
     });
   });
   grid.getSelectionModel().on('selectionchange', function(sm){
-    Ext.getCmp('removeEntryBtn').setDisabled(playlist.readOnly || sm.getCount() < 1);
+    Ext.getCmp('removeEntryBtn').setDisabled(sm.getCount() < 1);
     Ext.getCmp('editMediaBtn').setDisabled(sm.getCount() < 1);
   });
 
@@ -393,7 +395,7 @@
       addManyEntriesProgressEnd: '${this.msgs.get('playlist.entries.addMany.msgBox.progressEnd')?js_string}',
       addManyEntriesProgress: '${this.msgs.get('playlist.entries.addMany.msgBox.progress')?js_string}'
     },
-    readOnly: ${(this.playlist.readOnly)?string}
+    searchBased: ${(this.playlist.searchBased)?string}
   };
   initPlaylistView();
   [/#if]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.