Skip to content
Snippets Groups Projects

Dev#59734 zendafi form profil page

Merged Ghislain Loas requested to merge dev#59734_zendafi_form_profil_page into WIP
4 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Laurent
    Laurent @llaffont started a thread on an old version of the diff
    188 for($division = 1; $division <= Class_Profil::DIV_FLOTANTTE; $division++) {
    196 189
    197 // permet de ne pas écraser un module existant,
    198 // on réaffecte un id si c'est un nouveau module
    199 if ($id_module == 'new') {
    200 $id_module = $profil->createNewModuleAccueilId();
    201 }
    190 if(!$widgets = $this->_getParam('division' . $division))
    191 continue;
    202 192
    203 $type_module=$elem[2];
    204 $str_preferences=trim($elem[3]);
    193 $widgets = array_filter(explode(';', $widgets));
    194 foreach($widgets as $widget) {
    195 $config = explode('-', $widget);
    196 $id = $config[1];
  • Laurent
    Laurent @llaffont started a thread on the diff
    187 return $enreg;
    184 protected function _parseSaveContentString() {
    185 $modules = ['modules' => []];
    188 186 $profil = Class_Profil::find($this->id_profil);
    189 // Decoupage des modules
    190 $modules = array_filter(explode(';box',$cfg_module));
    191 foreach ($modules as $module) {
    192 $elem = explode('|', $module);
    193 $division=substr($elem[0],-1);
    194 187
    195 $id_module=$elem[1];
    188 for($division = 1; $division <= Class_Profil::DIV_FLOTANTTE; $division++) {
    196 189
    197 // permet de ne pas écraser un module existant,
    198 // on réaffecte un id si c'est un nouveau module
    199 if ($id_module == 'new') {
  • Laurent
    Laurent @llaffont started a thread on an old version of the diff
    10 * is applied to this software (see README file).
    11 *
    12 * BOKEH is distributed in the hope that it will be useful,
    13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    15 * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
    16 *
    17 * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
    18 * along with BOKEH; if not, write to the Free Software
    19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
    20 */
    21
    22
    23 class ZendAfi_View_Helper_ProfileComposition extends ZendAfi_View_Helper_BaseHelper {
    24 public function ProfileComposition($name, $entity, $attribs = []) {
    25 Class_ScriptLoader::getInstance()->loadProfileComposition();
    • ça me dérange de créer une méthode dans ScriptLoader qui est déjà bien chargé juste pour ça.

      Je mettrai plutôt la méthode dans le Helper avec un:

      $this->_loadProfileComposition()

    • Please register or sign in to reply
  • Laurent
    Laurent @llaffont started a thread on an old version of the diff
    190 194 }
    191 195
    192 196
    193 197
    194 198 function toggleVisibilityForElement(eventSourceSelector, objectToShowSelector, testingAlgorithm) {
    195 199 var objectToShow = $(objectToShowSelector);
    200 var source_object = $(eventSourceSelector);
    196 201
    197 var toggleVisibility = function(element) {
    198 if (element.length == 0) return;
    199 if (testingAlgorithm(element))
    200 objectToShow.fadeIn();
    201 else
    202 objectToShow.fadeOut();
    202 var toggleVisibility = function() {
    203 if (testingAlgorithm(source_object))
  • Ghislain Loas added 14 commits

    added 14 commits

    • 2f5034ac...052336cf - 12 commits from branch WIP
    • c15e14e8 - Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#59734_…
    • a80bd6a8 - dev #59734 fix rt comments

    Compare with previous version

  • merged

  • Ghislain Loas mentioned in commit 96442cb8

    mentioned in commit 96442cb8

Please register or sign in to reply